From 2cdfc2901063cf4e7133091e2f82a89d41f3f50d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Nov 2021 19:21:23 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml | 12 +++++
src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java | 4 +-
src/main/java/org/springblade/modules/record/entity/Record.java | 15 +++++++
src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java | 3 +
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 2
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 20 +++++++++-
src/main/java/org/springblade/modules/recordk/vo/RecordkVO.java | 1
src/main/java/org/springblade/modules/system/controller/UserController.java | 2
src/main/java/org/springblade/modules/recordk/entity/Recordk.java | 1
src/main/java/org/springblade/modules/recordk/service/IRecordkService.java | 3 +
10 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 5a6fba4..ee0dc67 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1220,7 +1220,7 @@
IFNULL( J.num, 0 ) AS num
FROM
( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
- LEFT JOIN (
+ INNER JOIN (
SELECT
COUNT( * ) AS num,
dept_id
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 9a924ba..843ccfc 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -172,5 +172,20 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date permitime;
+ @ApiModelProperty(value = "派出所审批时间")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date ptime;
+
+ @ApiModelProperty(value = "县审批时间")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date stime;
+
+ @ApiModelProperty(value = "市审批时间")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date xtime;
+
}
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index 10e72cd..0f045f6 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -27,6 +27,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.service.IRecordkService;
@@ -50,7 +52,7 @@
public class RecordkController extends BladeController {
private final IRecordkService recordkService;
-
+ private final IInformationService informationService;
/**
* 详情
*/
@@ -80,7 +82,21 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入recordk")
public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
- IPage<RecordkVO> pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk);
+ IPage<RecordkVO> pages;
+ if (recordk.getUsetype().equals("0")) {
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
+ } else if (recordk.getUsetype().equals("1")) {
+ String childer = informationService.selJurchilder(recordk.getJurisdiction());
+ String[] split = childer.split(",");
+ String strArrays = "";
+ for (int j = 0; j < split.length; j++) {
+ strArrays += "'" + split[j] + "',";
+ }
+ String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,jurisdiction);
+ } else {
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
+ }
return R.data(pages);
}
diff --git a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
index a2585ab..3b8ca35 100644
--- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
+++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -151,5 +151,6 @@
private String contacts;
private String contactscell;
private String approve;
+ private String jurisdiction;
}
diff --git a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
index 242a45f..e0f660c 100644
--- a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
+++ b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.vo.RecordkVO;
@@ -38,6 +39,6 @@
* @param recordk
* @return
*/
- List<RecordkVO> selectRecordkPage(IPage page, RecordkVO recordk);
+ List<RecordkVO> selectRecordkPage(IPage page, @Param("recordk")RecordkVO recordk, String jurisdiction);
}
diff --git a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
index cd853c9..6760012 100644
--- a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
+++ b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
@@ -28,11 +28,21 @@
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
<result column="approve" property="approve"/>
+ <result column="jurisdiction" property="jurisdiction"/>
</resultMap>
<select id="selectRecordkPage" resultMap="recordkResultMap">
- select * from sys_recordk
+ select * from sys_recordk where 1=1
+ <if test="recordk.ptype!=null and recordk.ptype!=''">
+ and ptype=#{recordk.ptype}
+ </if>
+ <if test="recordk.usetype=='1'.toString()">
+ and jurisdiction in(${jurisdiction})
+ </if>
+ <if test="recordk.usetype=='2'.toString()">
+ and jurisdiction=#{recordk.jurisdiction}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java b/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
index 93d7917..042b129 100644
--- a/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
+++ b/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.vo.RecordkVO;
@@ -36,6 +37,6 @@
* @param recordk
* @return
*/
- IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk);
+ IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, @Param("recordk")RecordkVO recordk, String jurisdiction);
}
diff --git a/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java b/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java
index 7bd33ca..890e813 100644
--- a/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java
+++ b/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java
@@ -34,8 +34,8 @@
public class RecordkServiceImpl extends ServiceImpl<RecordkMapper, Recordk> implements IRecordkService {
@Override
- public IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk) {
- return page.setRecords(baseMapper.selectRecordkPage(page, recordk));
+ public IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk, String jurisdiction) {
+ return page.setRecords(baseMapper.selectRecordkPage(page, recordk,jurisdiction));
}
}
diff --git a/src/main/java/org/springblade/modules/recordk/vo/RecordkVO.java b/src/main/java/org/springblade/modules/recordk/vo/RecordkVO.java
index 747dfa8..ae2e2e3 100644
--- a/src/main/java/org/springblade/modules/recordk/vo/RecordkVO.java
+++ b/src/main/java/org/springblade/modules/recordk/vo/RecordkVO.java
@@ -32,5 +32,6 @@
@ApiModel(value = "RecordkVO对象", description = "RecordkVO对象")
public class RecordkVO extends Recordk {
private static final long serialVersionUID = 1L;
+ private String usetype;
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 4f6377d..455691d 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -151,7 +151,7 @@
*/
@GetMapping("/page-security")
public R<IPage<UserVO>> pageSecurity(@ApiIgnore UserVO user, Query query) {
- user.setAccount("admin");
+ //user.setAccount("admin");
IPage<UserVO> pages = userService.selectUserPageSecurity(Condition.getPage(query), user);
return R.data(pages);
}
--
Gitblit v1.9.3