From 035d6d22f53b0d5e84262df7c88da9d58b119e8b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 25 十二月 2022 11:58:41 +0800
Subject: [PATCH] 12.25.1
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java
index 3bcb0f2..cbefd1c 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.show.ApplyEntity;
+import com.lf.server.entity.show.FlowEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
@@ -19,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.sql.Timestamp;
import java.util.List;
/**
@@ -74,25 +76,29 @@
}
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ鐢宠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userid", value = "鐢ㄦ埛ID", dataType = "Integer", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "鍛�"),
+ @ApiImplicitParam(name = "status", value = "鐘舵��", dataType = "Integer", paramType = "query", example = "0"),
+ @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-12-09 09:00:00"),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-12-25 17:00:00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<ApplyEntity>> selectByPageAndCount(Integer userid, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectByPage")
+ public ResponseMsg<Object> selectByPage(String uname, Integer status, Timestamp start, Timestamp end, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = applyService.selectCount(userid);
+ int count = applyService.selectCount(uname, status, start, end);
if (count == 0) {
return success(0, null);
}
- List<ApplyEntity> rs = applyService.selectByPage(userid, pageSize, pageSize * (pageIndex - 1));
+ UserEntity ue = tokenService.getCurrentUser(req);
+ List<ApplyEntity> rs = applyService.selectByPage(ue.getId(), uname, status, start, end, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -101,65 +107,76 @@
}
@SysLog()
- @ApiOperation(value = "鎻掑叆涓�鏉�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ApplyEntity", paramType = "body")
- })
- @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody ApplyEntity entity, HttpServletRequest req) {
+ @ApiOperation(value = "鏌ヨ寰呭鏍告暟")
+ @GetMapping(value = "/selectSubmits")
+ public ResponseMsg<Object> selectSubmits(HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- entity.setCreateUser(ue.getId());
- }
+ int rows = applyService.selectSubmits(ue.getId());
- int count = applyService.insert(entity);
-
- return success(count);
+ return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex.getMessage(), null);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯")
+ @ApiOperation(value = "鏌ヨ娴佺▼")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
+ @ApiImplicitParam(name = "applyId", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
+ @GetMapping(value = "/selectFlows")
+ public ResponseMsg<Object> selectFlows(Integer applyId) {
try {
- if (ids == null || ids.isEmpty()) {
- return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
- }
+ List<FlowEntity> rs = applyService.selectFlows(applyId);
- int count = applyService.deletes(ids);
-
- return success(count);
+ return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex.getMessage(), null);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉�")
+ @ApiOperation(value = "搴熷純鐢宠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ApplyEntity", paramType = "body")
+ @ApiImplicitParam(name = "applyId", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
- @ResponseBody
- @PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> update(@RequestBody ApplyEntity entity, HttpServletRequest req) {
+ @GetMapping(value = "/deleteForDiscard")
+ public ResponseMsg<Object> deleteForDiscard(Integer applyId) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- entity.setUpdateUser(ue.getId());
- }
+ //
- int count = applyService.update(entity);
-
- return success(count);
+ return success(null);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎻愪氦娴佺▼")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "flowId", value = "鐢宠娴佺▼ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ public ResponseMsg<Object> updateForSubmit(Integer flowId) {
+ try {
+
+ return success(null);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎵撳洖娴佺▼")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "flowId", value = "鐢宠娴佺▼ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ public ResponseMsg<Object> updateForReject(Integer flowId) {
+ try {
+
+ return success(null);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
}
}
}
--
Gitblit v1.9.3