From b97caf1162fcecd52b25cc942864691bbd3ed066 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 17 十一月 2022 17:40:39 +0800
Subject: [PATCH] 文书管理
---
ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java | 17 ++++-
ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java | 6 +-
ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml | 25 ++++++--
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java | 3
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java | 4
ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java | 110 ++----------------------------------
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java | 5 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java | 2
ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java | 8 ++
9 files changed, 59 insertions(+), 121 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
index 837cbb8..092435d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
@@ -34,10 +34,10 @@
@GetMapping("/query")
@ApiOperation(value = "鏌ヨlist")
@LogSave(operationType = "鏂囦功绠＄悊", contain = "鏌ヨ鏂囦功")
- public CommonResult search(@RequestParam Integer size,
- @RequestParam Integer current,
- @RequestParam(required = false) Integer writType) {
- return CommonResult.success(iWritService.selectWritPage(new Page<>(current, size),writType));
+ public CommonResult search(@RequestParam Integer pageSize,
+ @RequestParam Integer currentPage,
+ @RequestParam(required = false) String keyword) {
+ return CommonResult.success(iWritService.selectWritPage(new Page<>(currentPage, pageSize), keyword));
}
@GetMapping("/query_one")
@@ -54,6 +54,15 @@
return CommonResult.success(iWritService.updateById(writ));
}
+ @DeleteMapping("/delete/{id}")
+ @ApiOperation(value = "鎵归噺")
+ @LogSave(operationType = "鏂囦功绠＄悊", contain = "鍒犻櫎鏂囦功")
+ public CommonResult delete(@PathVariable Long id) {
+ Writ writ = iWritService.getById(id);
+ writ.setValue("");
+ return CommonResult.success(iWritService.updateById(writ));
+ }
+
@PutMapping("/deletion_batch")
@ApiOperation(value = "鎵归噺鍒犻櫎")
@LogSave(operationType = "鏂囦功绠＄悊", contain = "鍒犻櫎鏂囦功")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java b/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java
index f166b05..387901b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java
@@ -36,10 +36,10 @@
@GetMapping("/query")
@ApiOperation(value = "鏌ヨ")
@LogSave(operationType = "鏂囦功妯℃澘绠＄悊", contain = "鏌ヨ鏂囦功妯℃澘")
- public CommonResult search(@RequestParam Integer size,
- @RequestParam Integer current,
+ public CommonResult search(@RequestParam Integer pageSize,
+ @RequestParam Integer currentPage,
@RequestParam(required = false) String name) {
- return CommonResult.success(iWritTemplateService.page(new Page<>(current, size), new LambdaQueryWrapper<WritTemplate>()
+ return CommonResult.success(iWritTemplateService.page(new Page<>(currentPage, pageSize), new LambdaQueryWrapper<WritTemplate>()
.like(StringUtils.isNotBlank(name), WritTemplate::getName, name)));
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
index 3d212c5..306e208 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -67,6 +68,7 @@
*/
@TableField("send_time")
@ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private LocalDateTime sendTime;
/**
@@ -74,6 +76,7 @@
*/
@TableField("limit_time")
@ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private LocalDateTime limitTime;
/**
@@ -88,6 +91,7 @@
*/
@TableField("rectify_time")
@ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private LocalDateTime rectifyTime;
/**
@@ -144,6 +148,7 @@
*/
@TableField("create_time")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java b/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java
index c0b120d..17b46a5 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -43,4 +44,11 @@
private String code;
+ /**
+ * 鍓嶇瀵瑰簲缁勪欢鍚嶇О
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("create_time")
+ private String createTime;
+
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java
index ba5a336..fc76acb 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java
@@ -4,6 +4,7 @@
import com.ycl.entity.caseHandler.Writ;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.vo.writ.WritVO;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -15,5 +16,5 @@
*/
public interface WritMapper extends BaseMapper<Writ> {
- Page<WritVO> selectWritPage(Page<Writ> writPage, Integer writType);
+ Page<WritVO> selectWritPage(Page<Writ> writPage, @Param("keyword") String keyword);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java
index bb0ca82..749e8c9 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java
@@ -17,5 +17,5 @@
public interface IWritService extends IService<Writ> {
- Page<WritVO> selectWritPage(Page<Writ> writPage, Integer writType);
+ Page<WritVO> selectWritPage(Page<Writ> writPage, String keyword);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java
index c79f168..eb18107 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java
@@ -25,7 +25,7 @@
WritMapper writMapper;
@Override
- public Page<WritVO> selectWritPage(Page<Writ> writPage, Integer writType) {
- return writMapper.selectWritPage(writPage,writType);
+ public Page<WritVO> selectWritPage(Page<Writ> writPage, String keyword) {
+ return writMapper.selectWritPage(writPage, keyword);
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java b/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java
index 83a1156..985b4f9 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java
@@ -1,5 +1,6 @@
package com.ycl.vo.writ;
+import com.ycl.entity.caseHandler.Writ;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,113 +9,14 @@
@Data
@ApiModel(value = "WritVO")
-public class WritVO {
- /**
- * 妗堜欢id(鍚寀ms_base_case琛╥d)
- */
- @ApiModelProperty(value = "妗堜欢id")
- private Long baseCaseId;
+public class WritVO extends Writ {
- /**
- * 杩濆缓id
- */
- @ApiModelProperty(value = "杩濆缓id")
- private Long illegalBuildingId;
+ private String writTypeName;
- /**
- * 鏂囦功绉嶇被
- */
- @ApiModelProperty(value = "鏂囦功绉嶇被")
- private String writType;
+ private String categoryName;
- /**
- * 鏂囦功缂栧彿
- */
- @ApiModelProperty(value = "鏂囦功缂栧彿")
- private String writTemplateName;
+ private String eventCode;
- /**
- * 杩濇硶绫诲瀷
- */
- @ApiModelProperty(value = "杩濇硶绫诲瀷")
- private Integer illegalType;
-
- /**
- * 鏂囦功鍙戞斁鏃堕棿
- */
- @ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
- private LocalDateTime sendTime;
-
- /**
- * 鏂囦功闄愬畾鏃堕棿
- */
- @ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
- private LocalDateTime limitTime;
-
- /**
- * 鏂囦功鍙戞斁鍐呭
- */
- @ApiModelProperty(value = "鏂囦功鍙戞斁鍐呭")
- private String sendContent;
-
- /**
- * 瀹為檯鏁存敼鏃堕棿
- */
- @ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
- private LocalDateTime rectifyTime;
-
- /**
- * 鏁存敼鎯呭喌
- */
- @ApiModelProperty(value = "鏁存敼鎯呭喌")
- private String rectifySituation;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-
- /**
- * 鏂囦功鐓х墖涓婁紶
- */
- @ApiModelProperty(value = "鏂囦功鐓х墖涓婁紶")
- private String writPic;
-
- /**
- * 鏁存敼鍓嶇収鐗�
- */
- @ApiModelProperty(value = "鏁存敼鍓嶇収鐗�")
- private String originalPic;
-
- /**
- * 鏁存敼鍚庣収鐗�
- */
- @ApiModelProperty(value = "鏁存敼鍚庣収鐗�")
- private String rectifiedPic;
-
- /**
- * 鍏朵粬鐓х墖
- */
- @ApiModelProperty(value = "鍏朵粬鐓х墖")
- private String otherPic;
-
- /**
- * 鍒涘缓浜�
- */
- @ApiModelProperty(value = "鍒涘缓浜�")
- private Long createUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
- /**
- * 鏂囦功妯℃澘鍊�
- */
- @ApiModelProperty(value = "鏂囦功妯℃澘鍊�")
- private String value;
+ private String templateCode;
}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml
index 0def7c2..d2ce81b 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml
@@ -23,20 +23,33 @@
<result column="create_time" property="createTime"/>
</resultMap>
+ <resultMap id="VoMap" type="com.ycl.vo.writ.WritVO" extends="BaseResultMap">
+ <result column="writ_type_name" property="writTypeName" jdbcType="VARCHAR"/>
+ <result column="category_name" property="categoryName" jdbcType="VARCHAR"/>
+ <result column="event_code" property="eventCode" jdbcType="VARCHAR"/>
+ <result column="template_code" property="templateCode" jdbcType="VARCHAR"/>
+
+ </resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
base_case_id
, illegal_building_id, writ_type, writ_code, illegal_type, send_time, limit_time, send_content, rectify_time, rectify_situation, remark, writ_pic, original_pic, rectified_pic, othen_pic, create_user, create_time
</sql>
- <select id="selectWritPage" resultType="com.ycl.vo.writ.WritVO">
- SELECT t1.*, t2.`name` as writTemplateName
- FROM ums_writ t1
- LEFT JOIN ums_writ_template t2 on t1.writ_type = t2.id
+ <select id="selectWritPage" resultMap="VoMap">
+ SELECT w.*, wt.`name` as writ_type_name,bc.`code` event_code,dd.`name` category_name,wt.code template_code
+ FROM ums_writ w
+ LEFT JOIN ums_writ_template wt on w.writ_type = wt.id
+ LEFT JOIN ums_illegal_building ib on w.illegal_building_id = ib.base_case_id
+ LEFT JOIN ums_data_dictionary dd on ib.category_id = dd.id
+ LEFT JOIN ums_base_case bc on ib.base_case_id = bc.id
<where>
- <if test="writType != null">
- t1.writ_type=#{writType}
+ <if test="keyword != null">
+ w.writ_code like CONCAT('%',#{keyword},'%')
+ or bc.`code` like CONCAT('%',#{keyword},'%')
+ or wt.name like CONCAT('%',#{keyword},'%')
</if>
</where>
+ order by w.create_time desc
</select>
</mapper>
--
Gitblit v1.8.0