Skip to content

D
device-back
提交 c6d2022a authored 作者: 133's avatar 133
浏览文件
操作

[模版] 工作交接模版提交 bill3

上级 91cba773
隐藏空白字符变更
内嵌 并排
正在显示 包含 15 行增加 和 7 行删除
dev-union/src/main/resources/bill3.html
浏览文件 @ c6d2022a
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<!--工作交接-->
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Document</title> <title>Document</title>
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<div class="title"> <div class="title">
<div class="main-title"> <div class="main-title">
<span> <span>
工作交接单2 工作交接单
</span> </span>
</div> </div>
<div style="width:100%;text-align:left;font-size: 1px;margin-bottom:2px"> <div style="width:100%;text-align:left;font-size: 1px;margin-bottom:2px">
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
</div> </div>
</div> </div>
</div> </div>
<p class="bottomTxt">第${page}页/共${count}页</p> <p class="bottomTxt">第${page!}页/共${count!}页</p>
</div> </div>
<!--<script type="text/javascript">--> <!--<script type="text/javascript">-->
<!--function altRows(id){--> <!--function altRows(id){-->
......
dev-user/pom.xml
浏览文件 @ c6d2022a
...@@ -35,10 +35,7 @@ ...@@ -35,10 +35,7 @@
<artifactId>socket</artifactId> <artifactId>socket</artifactId>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-file</artifactId>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
<artifactId>blockcha</artifactId> <artifactId>blockcha</artifactId>
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java
浏览文件 @ c6d2022a
...@@ -4,6 +4,7 @@ import com.tykj.dev.config.swagger.AutoDocument; ...@@ -4,6 +4,7 @@ import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.user.subject.entity.SecurityUser; import com.tykj.dev.device.user.subject.entity.SecurityUser;
import com.tykj.dev.device.user.subject.entity.Units; import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.service.UnitsService; import com.tykj.dev.device.user.subject.service.UnitsService;
import com.tykj.dev.device.user.subject.service.UserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -13,6 +14,11 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; ...@@ -13,6 +14,11 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/** /**
* @author zjm * @author zjm
* @version 1.0.0 * @version 1.0.0
...@@ -29,6 +35,9 @@ public class UnitsController { ...@@ -29,6 +35,9 @@ public class UnitsController {
@Autowired @Autowired
UnitsService unitsService; UnitsService unitsService;
@Autowired
UserService userService;
@GetMapping(value = "/find/{unitsId}") @GetMapping(value = "/find/{unitsId}")
@ApiOperation(value = "根据单位ID查询对象", notes = "返回单位对象") @ApiOperation(value = "根据单位ID查询对象", notes = "返回单位对象")
public ResponseEntity findUnits(@PathVariable Integer unitsId) { public ResponseEntity findUnits(@PathVariable Integer unitsId) {
...@@ -53,6 +62,8 @@ public class UnitsController { ...@@ -53,6 +62,8 @@ public class UnitsController {
return ResponseEntity.ok(unitsService.findLeftNavigation(securityUser)); return ResponseEntity.ok(unitsService.findLeftNavigation(securityUser));
} }
@GetMapping(value = "/findAll/GreaterThanEqual/{level}") @GetMapping(value = "/findAll/GreaterThanEqual/{level}")
@ApiOperation(value = "根据当前用户的单位等级，查询所有的下级单位以及自己单位", notes = "单位集合") @ApiOperation(value = "根据当前用户的单位等级，查询所有的下级单位以及自己单位", notes = "单位集合")
public ResponseEntity GreaterThanEqualLeven(@PathVariable Integer level) { public ResponseEntity GreaterThanEqualLeven(@PathVariable Integer level) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论