diff --git a/pom.xml b/pom.xml
index 5fc6ee94..54874c8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
5.2.3
1.18.4
3.17
+ 2.2
/work/linzi
${project.artifactId}-${project.version}.jar
@@ -255,6 +256,12 @@
suibian
+
+ cn.wanghaomiao
+ JsoupXpath
+ ${jsoupXpath.version}
+
+
diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 049b6fc9..0a57c291 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -1460,23 +1460,14 @@ public class ResultRecordController extends AbstractController {
@ApiOperation("导出绩效详情报表")
@GetMapping("/recordDetailExport")
- @ApiResponses({@ApiResponse(code = 200,message = "成功",response = RecordDetailExportResp.class)})
+ @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRecordDetailDto.class)})
public R recordDetailExport(Long recordId){
- RecordDetailExportResp resp = new RecordDetailExportResp();
Map map = Maps.newHashMap();
map.put("id",recordId);
- R respnse = getDetail(map);
- if(respnse.isSuccess()){
- ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data");
- //chartResultService.selectLevelDetailList(req);
- // TODO 暂时按照详情页面数据返回
-
- resp.setRecortModelDtos(resultRecordDetailDto.getRecortModelDtos());
- }
-
- return R.ok().put("data",resp);
+ return getDetail(map);
}
+
@ApiOperation("保存绩效详情报表计划")
@PostMapping("/recordDetailExplan")
@ApiResponses({@ApiResponse(code = 200,message = "成功")})
diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index e64ebe01..e37e9588 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -520,12 +520,15 @@ public class StaffRoleServiceImpl extends ServiceImpl staffMenuDepartmentList = staffMenuService.selectByParentId(RoleMenuEnums.DEPARTMENT_PM.getType());
if (CollectionUtils.isNotEmpty(staffMenuDepartmentList)) {
staffMenus.addAll(staffMenuDepartmentList);
}
+ flag = true;
}
if (CollectionUtils.isNotEmpty(staffRoleList)) {
@@ -542,6 +545,7 @@ public class StaffRoleServiceImpl extends ServiceImpl 0) {
List authIds = new ArrayList<>();
@@ -553,6 +557,9 @@ public class StaffRoleServiceImpl extends ServiceImpl sel = jxNode.sel("//*[@class='commits-row']");
+ for(JXNode jx:sel){
+ List sel2 = jx.sel("//*[@class='commit flex-row js-toggle-container']");
+ for(JXNode j:sel2){
+ String avatar = j.sel("//img[@class='avatar s36 hidden-xs has-tooltip']/@src").get(0).toString();
+ System.out.println("头像 " + avatar);
+
+ String commit = j.sel("//a[@class='commit-row-message item-title']/text()").get(0).toString();
+ System.out.println("摘要 " + commit);
+
+ String name = j.sel("//a[@class='commit-author-link has-tooltip']/text()").get(0).toString();
+ System.out.println("姓名 " + name);
+
+ String time = j.sel("//time[@class='js-timeago']/@datetime").get(0).toString();
+ System.out.println("时间 " + time);
+
+
+ String version = j.sel("//div[@class='label label-monospace']/text()").get(0).toString();
+ System.out.println("版本 " + version);
+
+ }
+
+
+
+ }
+ System.out.println();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
}