Skip to content

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

[用户 决算 核查] 用户添加判断是否为已冻结的账号 决算 查询标题接口修改为标题和截止时间 决算标题 改为 xx-xx决算报告

上级 722f3a25
显示空白字符变更
内嵌 并排
正在显示 包含 1184 行增加 和 430 行删除
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @ 1acf5f4f
...@@ -179,9 +179,9 @@ public class DeviceCheckController { ...@@ -179,9 +179,9 @@ public class DeviceCheckController {
Integer provId = taskService.get(examJobId).getParentTaskId(); Integer provId = taskService.get(examJobId).getParentTaskId();
// 检查的job id 找到 father 进而找到 father的billid 进而找到title Id // 检查的job id 找到 father 进而找到 father的billid 进而找到title Id
Integer statId = taskService.get(provId).getBillId(); Integer statId = taskService.get(provId).getBillId();
String title = statRepo.getOne(statId).getTitle(); DeviceCheckStat deviceCheckStat = statRepo.getOne(statId);
String title = deviceCheckStat.getTitle();
return ResponseEntity.ok(title); return ResponseEntity.ok(new CheckTitleAndTimeVo(title,deviceCheckStat.getEndTime()));
} }
@ApiOperation(value = "发起自动核查", notes = "发起自动核查") @ApiOperation(value = "发起自动核查", notes = "发起自动核查")
......
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckTitleAndTimeVo.java 0 → 100644
浏览文件 @ 1acf5f4f
package com.tykj.dev.device.confirmcheck.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
/**
* @author zjm
* @version 1.0.0
* @ClassName CheckTitleAndTimeVo.java
* @Description TODO
* @createTime 2021年04月24日 17:52:00
*/
@AllArgsConstructor
@NoArgsConstructor
@Data
public class CheckTitleAndTimeVo {
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("截止时间")
private LocalDateTime createTime;
}
dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java
浏览文件 @ 1acf5f4f
...@@ -55,7 +55,7 @@ public class FinalCheckServiceImpl implements FinalCheckService { ...@@ -55,7 +55,7 @@ public class FinalCheckServiceImpl implements FinalCheckService {
@Override @Override
public FinalReportVo generateReport(LocalDate startTime, LocalDate endTime) { public FinalReportVo generateReport(LocalDate startTime, LocalDate endTime) {
String name = LocalDate.now().getYear() + "决算报告"; String name = startTime+"～"+endTime + "决算报告";
String unitName = userService.getCurrentUserUnitName(); String unitName = userService.getCurrentUserUnitName();
String operatorName = userService.getCurrentUserName(); String operatorName = userService.getCurrentUserName();
FinalReport report = new FinalReport(name, unitName, startTime, endTime, LocalDateTime.now(), operatorName); FinalReport report = new FinalReport(name, unitName, startTime, endTime, LocalDateTime.now(), operatorName);
......
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
浏览文件 @ 1acf5f4f
...@@ -495,7 +495,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService { ...@@ -495,7 +495,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
@Override @Override
public void judgeSeqNumbersInNotEqualLifeStatus(List<String> seqNumbers, Integer leftStatus) { public void judgeSeqNumbersInNotEqualLifeStatus(List<String> seqNumbers, Integer leftStatus) {
if (!deviceLibraryDao.existsAllBySeqNumberInAndLifeStatus(seqNumbers, leftStatus)){ if(!deviceLibraryDao.existsAllBySeqNumberInAndLifeStatus(seqNumbers, leftStatus)){
throw new ApiException(ResponseEntity.status(303).body("装备已被其他同单位专管员操作")); throw new ApiException(ResponseEntity.status(303).body("装备已被其他同单位专管员操作"));
} }
} }
......
dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceChange.java
浏览文件 @ 1acf5f4f
...@@ -22,8 +22,7 @@ import javax.persistence.*; ...@@ -22,8 +22,7 @@ import javax.persistence.*;
public class DeviceChange { public class DeviceChange {
@Id @Id
@GeneratedValue @GeneratedValue(strategy=GenerationType.IDENTITY) @ApiModelProperty(name = "主键id")
@ApiModelProperty(name = "主键id")
@Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT") @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
private Integer id; private Integer id;
......
dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java
浏览文件 @ 1acf5f4f
...@@ -135,7 +135,7 @@ public class DeviceLibrary { ...@@ -135,7 +135,7 @@ public class DeviceLibrary {
@ApiModelProperty(value = "管理状态,0-不再所属单位,1-在所属单位") @ApiModelProperty(value = "管理状态,0-不再所属单位,1-在所属单位")
private Integer manageStatus; private Integer manageStatus;
/** /**
* 生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失 * 生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失 12.清退
*/ */
@ApiModelProperty(value = "生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失") @ApiModelProperty(value = "生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失")
private Integer lifeStatus; private Integer lifeStatus;
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @ 1acf5f4f
...@@ -276,7 +276,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -276,7 +276,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
private TaskBto sealOfAuditTask(Integer unitId, Integer repelDetailId,Integer userId){ private TaskBto sealOfAuditTask(Integer unitId, Integer repelDetailId,Integer userId){
List<Integer> list=new ArrayList<>(); List<Integer> list=new ArrayList<>();
list.add(userId); list.add(userId);
return taskService.start(new TaskBto(StatusEnum.SCRAP_2224.id, "报废任务", null, ".", repelDetailId, BusinessEnum.SCRAP.id, unitId, 0, "", list)); return taskService.start(new TaskBto(StatusEnum.SCRAP_2224.id, "报废设备任务", null, ".", repelDetailId, BusinessEnum.SCRAP.id, unitId, 0, "", list));
} }
/** /**
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/ConditionsTrainVo.java
浏览文件 @ 1acf5f4f
...@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; ...@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
...@@ -30,16 +31,15 @@ public class ConditionsTrainVo { ...@@ -30,16 +31,15 @@ public class ConditionsTrainVo {
@ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime") @ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime")
private String dimName; private String dimName;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime") @ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime")
private Date statusTime; private LocalDateTime startTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "结束时间", example = "bmxx", name = "endTime") @ApiModelProperty(value = "结束时间", example = "bmxx", name = "endTime")
private Date endTime; private LocalDateTime endTime;
@ApiModelProperty(value = "单位id", example = "unitId", name = "statusTime") @ApiModelProperty(value = "单位id", example = "unitId", name = "statusTime")
private Integer unitId; private Integer unitId;
} }
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java
浏览文件 @ 1acf5f4f
...@@ -244,9 +244,9 @@ public class TrainThemeServiceImpl implements TrainThemeService { ...@@ -244,9 +244,9 @@ public class TrainThemeServiceImpl implements TrainThemeService {
private Page<TrainTheme> getContacts(ConditionsTrainVo conditionsTrainVo, Pageable pageable) { private Page<TrainTheme> getContacts(ConditionsTrainVo conditionsTrainVo, Pageable pageable) {
PredicateBuilder<TrainTheme> predicateBuilder = Specifications.and(); PredicateBuilder<TrainTheme> predicateBuilder = Specifications.and();
if (conditionsTrainVo.getEndTime() != null && conditionsTrainVo.getStatusTime() != null) { if (conditionsTrainVo.getEndTime() != null && conditionsTrainVo.getStartTime() != null) {
predicateBuilder.gt("startTime", conditionsTrainVo.getStatusTime()); predicateBuilder.gt("createTime", conditionsTrainVo.getStartTime());
predicateBuilder.lt("endTime", conditionsTrainVo.getEndTime()); predicateBuilder.lt("createTime", conditionsTrainVo.getEndTime());
} }
predicateBuilder.eq("unitsId",conditionsTrainVo.getUnitId()); predicateBuilder.eq("unitsId",conditionsTrainVo.getUnitId());
if (conditionsTrainVo.getDimName() != null) { if (conditionsTrainVo.getDimName() != null) {
......
dev-train/src/main/java/com/tykj/dev/device/train/task/TrainTask.java
浏览文件 @ 1acf5f4f
package com.tykj.dev.device.train.task; package com.tykj.dev.device.train.task;
import com.tykj.dev.device.task.service.TaskService; import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.train.dao.TrainThemeDao;
import com.tykj.dev.device.train.entity.TrainTheme;
import com.tykj.dev.device.train.service.TrainTaskService; import com.tykj.dev.device.train.service.TrainTaskService;
import com.tykj.dev.device.train.service.TrainThemeService; import com.tykj.dev.device.train.service.TrainThemeService;
import com.tykj.dev.device.user.subject.dao.UnitsDao; import com.tykj.dev.device.user.subject.dao.UnitsDao;
import com.tykj.dev.device.user.subject.service.MgrcertService; import com.tykj.dev.device.user.subject.service.MgrcertService;
import com.tykj.dev.device.user.subject.service.UserService; import com.tykj.dev.device.user.subject.service.UserService;
import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.StatusEnum; import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.socket.MyWebSocket; import com.tykj.dev.socket.MyWebSocket;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.Date; import java.util.Date;
...@@ -40,60 +46,67 @@ public class TrainTask { ...@@ -40,60 +46,67 @@ public class TrainTask {
@Autowired @Autowired
MyWebSocket myWebSocket; MyWebSocket myWebSocket;
@Autowired
TrainThemeDao trainThemeDao;
@Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 0/1 * * * ?")
private void signUpDeadline() { private void signUpDeadline() {
trainThemeService.findAllStatus(1).forEach( trainThemeService.findAllStatus(StatusEnum.TRAIN1000.id).forEach(
trainTheme -> { trainTheme -> {
log.info("[培训] 检查报名时间是否结束");
long time = new Date().getTime(); long time = new Date().getTime();
if (trainTheme.getTrainTime().getTime() > time) { if (trainTheme.getTrainTime().getTime() <= time) {
log.info("[培训] 检查报名时间{}",trainTheme.getTrainId());
//查询所有必须报名而没有报名的task 状态直接转为待培训 signUpEnd(trainTheme.getTrainId());
trainTaskService.selectBillidAndBillType(trainTheme.getTrainId(), 13, StatusEnum.TRAIN1001.id).forEach( }
taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1003, -1) }
);
trainTaskService.selectBillidAndBillType(trainTheme.getTrainId(), 13, StatusEnum.TRAIN1002.id).forEach(
taskBto -> taskService.moveToEnd(taskBto)
); );
}
trainTaskService.selectBillidAndBillType(trainTheme.getTrainId(), 13, StatusEnum.TRAIN1000.id).forEach( public void signUpEnd(Integer trainId) {
taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1010) TrainTheme trainTheme = trainThemeService.findById(trainId);
//查询所有必须报名而没有报名的task 状态直接转为待培训
trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1002.id).forEach(
taskBto -> {
taskService.moveToEnd(taskBto);
}
); );
//查询主task
TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
//主task往下推待培训状态，0
taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1010, 0);
//5 待培训
trainTheme.setTrainStatus(StatusEnum.TRAIN1010.id); trainTheme.setTrainStatus(StatusEnum.TRAIN1010.id);
trainThemeService.save(trainTheme); trainThemeService.save(trainTheme);
myWebSocket.sendMessage1();
}
}
);
} }
@Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 0/1 * * * ?")
private void trainingStarted() { private void trainingStarted() {
trainThemeService.findAllStatus(2).forEach( long time=new Date().getTime();
trainThemeService.findAllStatus(StatusEnum.TRAIN1010.id).forEach(
trainTheme -> { trainTheme -> {
//5 培训中 if (trainTheme.getStartTime().getTime() <= time){
trainTaskService.selectBillidAndBillType(trainTheme.getTrainId(), 13, StatusEnum.TRAIN1010.id).forEach( inTraining(trainTheme.getTrainId());
taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1004) }
);
trainTheme.setTrainStatus(StatusEnum.TRAIN1004.id);
trainThemeService.save(trainTheme);
}); });
} }
@Scheduled(cron = "0 0/1 * * * ?") private void inTraining( Integer trainId) {
private void trainingEnd() { TrainTheme trainTheme = trainThemeService.findById(trainId);
trainThemeService.findAllStatus(3).forEach( trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1010.id).forEach(
trainTheme -> { taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1004, taskBto.getInvolveUserIdList().get(0))
trainTaskService.selectBillidAndBillType(trainTheme.getTrainId(), 13, StatusEnum.TRAIN1004.id).forEach(
taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1008)
); );
//5 录入成绩 //5 培训中
trainTheme.setTrainStatus(StatusEnum.TRAIN1008.id); TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
// //主task往下推待培训状态，0
taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1004, 0);
trainTheme.setTrainStatus(StatusEnum.TRAIN1004.id);
trainThemeService.save(trainTheme); trainThemeService.save(trainTheme);
});
} }
// @Scheduled(cron = "10 * * * * ?") // @Scheduled(cron = "10 * * * * ?")
// private void trainingEnd1() { // private void trainingEnd1() {
// log.info("定时启动web推送"); // log.info("定时启动web推送");
......
dev-union/src/main/resources/bill.html 100644 → 100755
浏览文件 @ 1acf5f4f
<!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>
<style> <style>
body{ body {
font-family:SimHei; font-family: SimHei;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/ /*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page { @page {
size:297mm 210mm; size: 297mm 210mm;
} }
.bottomTxt { .bottomTxt {
text-align: center; text-align: center;
font-size: 10px; font-size: 10px;
...@@ -20,24 +23,28 @@ ...@@ -20,24 +23,28 @@
height: 10px; height: 10px;
line-height: 10px; line-height: 10px;
} }
.returnTablePrint{
.returnTablePrint {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
color: #000; color: #000;
cursor: default; cursor: default;
} }
.returnTablePrint .content{
.returnTablePrint .content {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.returnTablePrint .content>div{
.returnTablePrint .content>div {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
/* padding: 30px; */ /* padding: 30px; */
box-sizing: border-box; box-sizing: border-box;
} }
/* .returnTablePrint .content>p{ /* .returnTablePrint .content>p{
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -46,24 +53,27 @@ ...@@ -46,24 +53,27 @@
color: #4a475d; color: #4a475d;
} */ } */
.returnTablePrint .listWrapper{ .returnTablePrint .listWrapper {
/*margin: 0 auto;*/ /*margin: 0 auto;*/
/* height: calc(100% - 40px); */ /* height: calc(100% - 40px); */
box-sizing: border-box; box-sizing: border-box;
} }
.returnTablePrint .list{
.returnTablePrint .list {
/*margin: 0 auto;*/ /*margin: 0 auto;*/
height:calc(100% - 12px) height: calc(100% - 12px)
} }
.returnTablePrint .title{
.returnTablePrint .title {
width: 100%; width: 100%;
font-size: 22px; font-size: 22px;
text-align: center; text-align: center;
position: relative; position: relative;
/* margin: 0 0 15px; */ /* margin: 0 0 15px; */
padding:0 20px;
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 4px;
} }
/* .returnTablePrint .title span:nth-child(2){ /* .returnTablePrint .title span:nth-child(2){
font-size: 28px; font-size: 28px;
color: #000000; color: #000000;
...@@ -72,10 +82,11 @@ ...@@ -72,10 +82,11 @@
font-size: 20px; font-size: 20px;
color: #141414; color: #141414;
} */ } */
.returnTablePrint .title .number{ .returnTablePrint .title .number {
font-size: 12px; font-size: 10px;
color: #646464; color: #828282;
} }
/* .returnTablePrint .other{ /* .returnTablePrint .other{
width: 100%; width: 100%;
color: #141414; color: #141414;
...@@ -91,56 +102,69 @@ ...@@ -91,56 +102,69 @@
display: inline-block; display: inline-block;
margin:0 40px 0 10px; margin:0 40px 0 10px;
} */ } */
.returnTablePrint .listCon{ .returnTablePrint .listCon {
height: 100%; height: 100%;
border: 1px solid #7f7f7f; border: 1px solid #7f7f7f;
} }
.returnTablePrint .line1{
.returnTablePrint .line1 {
width: 100%; width: 100%;
font-size: 12px; font-size: 10px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
color:#000; color: #333;
line-height: 20px; line-height: 20px;
height: 20px;
} }
.returnTablePrint .line1 .sendTo { .returnTablePrint .line1 .sendTo {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
text-indent: 5px;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
} }
.returnTablePrint .line1 .sendNum { .returnTablePrint .line1 .sendNum {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
font-size: 10px;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
} }
.returnTablePrint .line1 .sendTo{
.returnTablePrint .line1 .sendTo {
border-right: 1px solid #7f7f7f; border-right: 1px solid #7f7f7f;
} }
.returnTablePrint .line1 .sendTo span:nth-child(2),.returnTablePrint .line1 .sendNum span:nth-child(2){
color: #4a475d; .returnTablePrint .line1 .sendTo span:nth-child(2),
.returnTablePrint .line1 .sendNum span:nth-child(2) {
display: inline-block; display: inline-block;
margin-left: 5px; margin-left: 5px;
} }
.returnTablePrint .line2{
.returnTablePrint .line2 {
height: 100%; height: 100%;
/* padding: 20px; */ /* padding: 20px; */
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
} }
.returnTablePrint .tableList{
.returnTablePrint .tableList {
height: 500px; height: 500px;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff; background-color: #fff;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) {
background-color:#fff; background-color: #fff;
} }
.returnTablePrint .line3{
.returnTablePrint .line3 {
height: 94px;
width: 100%; width: 100%;
} }
.returnTablePrint .line3 .left { .returnTablePrint .line3 .left {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
...@@ -148,33 +172,40 @@ ...@@ -148,33 +172,40 @@
position: relative; position: relative;
/* padding-bottom: 80px; */ /* padding-bottom: 80px; */
} }
.returnTablePrint .line3 .right { .returnTablePrint .line3 .right {
display: inline-block; display: inline-block;
width: 49%; /* width: 49%; */
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
/* padding-bottom: 80px; */ /* padding-bottom: 80px; */
} }
.returnTablePrint .line3 .left{
.returnTablePrint .line3 .left {
border-right: 1px solid #7f7f7f; border-right: 1px solid #7f7f7f;
height: 96px; padding: 5px 10px;
} box-sizing: border-box;
.returnTablePrint .line3 .left>span { height: 90%;
text-indent: 10px;
} }
.returnTablePrint .line3 .left>span,.returnTablePrint .line3 .right>span{
.returnTablePrint .line3 .left>span,
.returnTablePrint .line3 .right>span {
display: block; display: block;
margin: 6px 0px; /* line-height: 50px; */
} }
.returnTablePrint .line3 .right{
.returnTablePrint .line3 .right {
height: 100%; height: 100%;
height: 96px; padding: 5px 10px;
box-sizing: border-box;
} }
.returnTablePrint .line3 .left>span>span:nth-child(2),.returnTablePrint .line3 .right>span>span:nth-child(2){
display: inline-block; .returnTablePrint .line3 .left>span>span:nth-child(2),
margin-left: 20px; .returnTablePrint .line3 .right>span>span:nth-child(2) {
margin-left: 8px;
} }
.returnTablePrint .line3 i{
.returnTablePrint .line3 i {
display: block; display: block;
text-align: right; text-align: right;
position: absolute; position: absolute;
...@@ -183,51 +214,61 @@ ...@@ -183,51 +214,61 @@
font-style: normal; font-style: normal;
font-size: 12px; font-size: 12px;
} }
.returnTablePrint .line3 .right i{
.returnTablePrint .line3 .right i {
font-style: normal; font-style: normal;
} }
.returnTablePrint .line3 i>span>span{
.returnTablePrint .line3 i>span>span {
display: block; display: block;
} }
.returnTablePrint>>>.el-scrollbar__wrap { .returnTablePrint>>>.el-scrollbar__wrap {
overflow-x: hidden; overflow-x: hidden;
margin-bottom:0; margin-bottom: 0;
} }
.returnTablePrint .checkName span:nth-child(2){
.returnTablePrint .checkName span:nth-child(2) {
color: #4a475d; color: #4a475d;
display: inline-block; display: inline-block;
margin-left: 20px;
} }
.returnTablePrint>>>.el-table tbody .cell{
.returnTablePrint>>>.el-table tbody .cell {
color: #141414; color: #141414;
} }
.returnTablePrint .label{
color: #646464; .returnTablePrint .label {
font-size: 12px; color: #666;
font-size: 10px;
} }
.returnTablePrint .value{
color: #000; .returnTablePrint .value {
font-size: 12px; color: #333;
font-size: 10px;
} }
.returnTablePrint .main-title { .returnTablePrint .main-title {
font-size: 20px; font-size: 17px;
color: #000000; color: #333;
line-height: 20px; line-height: 20px;
text-align: center; text-align: center;
} }
.returnTablePrint .footer{
.returnTablePrint .footer {
display: flex; display: flex;
justify-content:flex-end; justify-content: flex-end;
padding:0 40px; padding: 0 40px;
box-sizing: border-box; box-sizing: border-box;
} }
.button-submit{
margin-left:50px; .button-submit {
margin-left: 50px;
} }
table.altrowstable { table.altrowstable {
width: 100%; width: 100%;
font-size: 11px; font-size: 16px;
color:#141414; color: #333;
border-width: 0px; border-width: 0px;
border-color: #a9c6c9; border-color: #a9c6c9;
border-collapse: collapse; border-collapse: collapse;
...@@ -235,43 +276,57 @@ ...@@ -235,43 +276,57 @@
table-layout: fixed; table-layout: fixed;
word-break: break-all; word-break: break-all;
} }
table.altrowstable th { table.altrowstable th {
border-width: 0px; height: 20px;
padding: 5px; font-size: 10px;
border-style: solid; background-color: #f3f3f3;
border-color: #a9c6c9;
background-color: #dedede;
} }
table.altrowstable td { table.altrowstable td {
border-width: 0px; height: 18px;
padding: 2px 5px; font-size: 10px;
/*border-style: solid;*/
/*border-color: #a9c6c9;*/
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
border-bottom: 1px solid #bebebe; width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
table.altrowstable .altrowstableTr:nth-child(odd) {
height: 18px;
word-break: break-all;
word-wrap: break-word;
background-color: #f8f8f8;
} }
.leftImg { .leftImg {
position: absolute; position: absolute;
top: -53px; bottom: 0px;
right: 85px; right: 69px;
} }
.rightImg { .rightImg {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
right: 70px; right: 70px;
} }
.oddrowcolor{
background-color:#fff; .oddrowcolor {
background-color: #fff;
} }
.evenrowcolor{
background-color:#fafafa; .evenrowcolor {
background-color: #fafafa;
} }
/*tr:nth-child(odd) {*/ /*tr:nth-child(odd) {*/
/* background: #fafafa;*/ /* background: #fafafa;*/
/*}*/ /*}*/
</style> </style>
</head> </head>
<body> <body>
...@@ -286,14 +341,17 @@ ...@@ -286,14 +341,17 @@
${title} ${title}
</span> </span>
</div> </div>
<div style="width:100%;text-align:left"> <div style="width:100%;font-size: 1px;">
<div style="text-align:left;display: inline-block; width: 32%" class="number"> <div style="display:inline-block;text-align:left; width: 33%; font-size: 10px;"
<span class="number">${number}</span> class="number">
<span>${number}</span>
</div> </div>
<div style="text-align:center;display: inline-block; width: 32%" class="number"> <div style="display:inline-block;text-align:center; width: 33%; font-size: 10px;"
<span >${ul}</span> class="number">
<span>(${ul})</span>
</div> </div>
<div style="text-align:right;display: inline-block; width: 28%" class="number"> <div style="display:inline-block;text-align:right; width: 33%; font-size: 10px;"
class="number">
<span>机密</span> <span>机密</span>
</div> </div>
</div> </div>
...@@ -301,21 +359,29 @@ ...@@ -301,21 +359,29 @@
<div class="listCon"> <div class="listCon">
<div class="line1"> <div class="line1">
<span class="sendTo"> <span class="sendTo">
<span>发往:</span> <span style="text-indent: 25px; display: inline-block;">发往:</span>
<span>${receiveUnit}</span> <span>${receiveUnit}</span>
</span> </span>
<span class="sendNum"> <span class="sendNum">
<span>批复文号:</span> <span style="text-indent: 25px; display: inline-block;">批复文号:</span>
<span>${replyNum}</span> <span>${replyNum}</span>
</span> </span>
</div> </div>
<div class="line2 tableList"> <div class="line2 tableList">
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" id="alternatecolor">
<tr> <tr style="border-bottom: 1px solid #dedede; border-top: 1px solid #dedede;">
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 420px;">装备序列号</th><th>备注</th> <!-- <th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 420px;">装备序列号</th><th>备注</th> -->
<th>序号</th>
<th>型号</th>
<th>形态</th>
<th>密级</th>
<th>应用领域</th>
<th>数量</th>
<th>装备序列号</th>
<th>备注</th>
</tr> </tr>
<#list documentDevices as dev> <#list documentDevices as dev>
<tr> <tr class="altrowstableTr">
<td> <td>
<#if dev.code != 0> <#if dev.code != 0>
${dev.code} ${dev.code}
...@@ -340,49 +406,57 @@ ...@@ -340,49 +406,57 @@
<span class="value">${senderUnit}</span> <span class="value">${senderUnit}</span>
</span> </span>
<span> <span>
<span class="label">签发人:</span> <span class="label"><span style="letter-spacing: 7px;">签发</span>人:</span>
<span class="value">${nameA1!}</span> <span class="value">${nameA1!}</span>
</span> </span>
<span> <span>
<span class="label">经办人:</span> <span class="label"><span style="letter-spacing: 7px;">经办</span>人:</span>
<span class="value">${nameA!}</span> <span class="value">${nameA!}</span>
</span> </span>
<i> <i>
<span style="position: relative;color: #646464"> <span style="color: #646464">
<span style="margin-bottom: 5px;">(公章)</span> <span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span> <span><span style="color: #fff;">1234</span>年<span
style="color: #fff;">0121</span>月<span
style="color: #fff;">0232</span>日</span>
<div class="leftImg"> <div class="leftImg">
<div id="pos0" > <div id="pos0">
<img style="width:80px;height:80px" src=${srcA} class="" id=""/> <img style="width:80px;height:80px" src=${srcA} class="" id="" />
</div> </div>
</div> </div>
</span> </span>
</i> </i>
</span> </span>
<span class="right"> <span class="right">
<span> <div style="width: 100%;">
<span style="width: 100%;display: inline-block;">
<span class="label">收件单位:</span> <span class="label">收件单位:</span>
<span class="value">${receiveUnit}</span> <span class="value">${receiveUnit}</span>
</span> </span>
<span> <span style="width: 100%;display: inline-block;">
<span class="label">经办人:</span> <span class="label"><span style="letter-spacing: 7px;">经办</span>人:</span>
<span class="value">${nameB!}</span> <span class="value">${nameB!}</span>
</span> </span>
<span> <span style="width: 100%;display: inline-block;">
<span class="label">经办人:</span> <span class="label"><span style="letter-spacing: 7px;">经办</span>人:</span>
<span class="value">${nameB1!}</span> <span class="value">${nameB1!}</span>
</span> </span>
</div>
<div style="position: relative;left: 280px;top: 38px;">
<i> <i>
<span style="color: #646464"> <span style="color: #646464">
<span style="margin-bottom: 5px;">(公章)</span> <span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span> <span><span style="color: #fff;">1234</span>年<span
style="color: #fff;">0121</span>月<span
style="color: #fff;">0232</span>日</span>
<div class="rightImg"> <div class="rightImg">
<div id="pos1" > <div id="pos1">
<img style="width:80px;height:80px" src=${srcB}/> <img style="width:80px;height:80px" src=${srcB} />
</div> </div>
</div> </div>
</span> </span>
</i> </i>
</div>
</span> </span>
</div> </div>
</div> </div>
...@@ -390,28 +464,11 @@ ...@@ -390,28 +464,11 @@
</div> </div>
</div> </div>
</div> </div>
<p class="bottomTxt">第${page}页/共${count}页</p > <div>
<p class="bottomTxt" style="float: left;">注：编号连续使用＂-＂省略</p>
<p class="bottomTxt" style="float: right;">第${page}页/共${count}页</p>
</div>
</div> </div>
<!--<script type="text/javascript">-->
<!--function altRows(id){-->
<!--if(document.getElementsByTagName){-->
<!--var table = document.getElementById(id);-->
<!--var rows = table.getElementsByTagName("tr");-->
<!--for(i = 0; i < rows.length; i++){-->
<!--if(i % 2 == 0){-->
<!--rows[i].className = "evenrowcolor";-->
<!--}else{-->
<!--rows[i].className = "oddrowcolor";-->
<!--}-->
<!--}-->
<!--}-->
<!--}-->
<!--window.onload=function(){-->
<!--altRows('alternatecolor');-->
<!--}-->
<!--</script>-->
</body> </body>
</html> </html>
\ No newline at end of file
dev-union/src/main/resources/bill1.html
浏览文件 @ 1acf5f4f
<!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>
<style> <style>
body{ body {
font-family:SimHei; font-family: SimHei;
padding: 0;
margin: 0;
} }
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/ /*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page { @page {
size:297mm 210mm; size: 297mm 210mm;
/*margin: 0.25in;*/ /*margin: 0.25in;*/
/*-fs-flow-bottom: "footer";*/ /*-fs-flow-bottom: "footer";*/
/*-fs-flow-left: "left";*/ /*-fs-flow-left: "left";*/
...@@ -17,6 +21,7 @@ ...@@ -17,6 +21,7 @@
/*border: thin solid black;*/ /*border: thin solid black;*/
/*padding: 1em;*/ /*padding: 1em;*/
} }
.bottomTxt { .bottomTxt {
text-align: center; text-align: center;
font-size: 10px; font-size: 10px;
...@@ -24,14 +29,16 @@ ...@@ -24,14 +29,16 @@
height: 10px; height: 10px;
line-height: 10px; line-height: 10px;
} }
.returnTablePrint{
.returnTablePrint {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
color: #000; color: #000;
cursor: default; cursor: default;
} }
.returnTablePrint .content{
.returnTablePrint .content {
width: 100%; width: 100%;
height: 100%; height: 100%;
/* background: url("../../../assets/img/detailsBg.png") no-repeat; */ /* background: url("../../../assets/img/detailsBg.png") no-repeat; */
...@@ -39,13 +46,15 @@ ...@@ -39,13 +46,15 @@
/*padding: 30px;*/ /*padding: 30px;*/
/*box-sizing: border-box;*/ /*box-sizing: border-box;*/
} }
.returnTablePrint .content>div{
.returnTablePrint .content>div {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
/* padding: 30px; */ /* padding: 30px; */
box-sizing: border-box; box-sizing: border-box;
} }
/* .returnTablePrint .content>p{ /* .returnTablePrint .content>p{
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -54,7 +63,7 @@ ...@@ -54,7 +63,7 @@
color: #4a475d; color: #4a475d;
} */ } */
.returnTablePrint .listWrapper{ .returnTablePrint .listWrapper {
/* width: 92%; */ /* width: 92%; */
/* margin: 0 auto; */ /* margin: 0 auto; */
/* padding: 0px 20px 20px 20px; */ /* padding: 0px 20px 20px 20px; */
...@@ -62,22 +71,26 @@ ...@@ -62,22 +71,26 @@
/*padding: 10px 30px;*/ /*padding: 10px 30px;*/
box-sizing: border-box; box-sizing: border-box;
} }
.returnTablePrint .list{
.returnTablePrint .list {
/* width: 92%; */ /* width: 92%; */
/* margin: 0 auto; */ /* margin: 0 auto; */
/* padding: 0px 20px 20px 20px; */ /* padding: 0px 20px 20px 20px; */
/* height: calc(100% - 75px); */ /* height: calc(100% - 75px); */
height:calc(100% - 12px) height: calc(100% - 12px)
} }
.returnTablePrint .title{
.returnTablePrint .title {
width: 100%; width: 100%;
font-size: 22px; font-size: 22px;
text-align: center; text-align: center;
position: relative; position: relative;
/* margin: 0 0 15px; */ /* margin: 0 0 15px; */
padding:0 20px; padding: 0;
box-sizing: border-box; box-sizing: border-box;
margin-top: 9px;
} }
/* .returnTablePrint .title span:nth-child(2){ /* .returnTablePrint .title span:nth-child(2){
font-size: 28px; font-size: 28px;
color: #000000; color: #000000;
...@@ -86,10 +99,11 @@ ...@@ -86,10 +99,11 @@
font-size: 20px; font-size: 20px;
color: #141414; color: #141414;
} */ } */
.returnTablePrint .title .number{ .returnTablePrint .title .number {
font-size: 12px; font-size: 10px;
color: #646464; color: #646464;
} }
/* .returnTablePrint .other{ /* .returnTablePrint .other{
width: 100%; width: 100%;
color: #141414; color: #141414;
...@@ -105,18 +119,20 @@ ...@@ -105,18 +119,20 @@
display: inline-block; display: inline-block;
margin:0 40px 0 10px; margin:0 40px 0 10px;
} */ } */
.returnTablePrint .listCon{ .returnTablePrint .listCon {
height: 100%; height: 100%;
border: 1px solid #7f7f7f; border: 1px solid #7f7f7f;
} }
.returnTablePrint .line1{
.returnTablePrint .line1 {
width: 100%; width: 100%;
font-size: 12px; font-size: 10px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
color:#000; color: #000;
line-height: 20px; line-height: 20px;
} }
.returnTablePrint .line1 .sendTo { .returnTablePrint .line1 .sendTo {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
...@@ -124,6 +140,7 @@ ...@@ -124,6 +140,7 @@
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
} }
.returnTablePrint .line1 .sendNum { .returnTablePrint .line1 .sendNum {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
...@@ -131,62 +148,76 @@ ...@@ -131,62 +148,76 @@
text-indent: 5px; text-indent: 5px;
border-left: 1px solid #7f7f7f; border-left: 1px solid #7f7f7f;
} }
.returnTablePrint .line1 .sendTo span:nth-child(2),.returnTablePrint .line1 .sendNum span:nth-child(2){
.returnTablePrint .line1 .sendTo span:nth-child(2),
.returnTablePrint .line1 .sendNum span:nth-child(2) {
color: #4a475d; color: #4a475d;
display: inline-block; display: inline-block;
margin-left: 5px; margin-left: 5px;
} }
.returnTablePrint .line2{
.returnTablePrint .line2 {
height: 100%; height: 100%;
/* padding: 20px; */ /* padding: 20px; */
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
} }
.returnTablePrint .tableList{
height: 500px; .returnTablePrint .tableList {
height: 492px;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff; background-color: #fff;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) {
background-color:#fff; background-color: #fff;
} }
.returnTablePrint .line3{
.returnTablePrint .line3 {
width: 100%; width: 100%;
height: 70px; height: 82px;
/* box-sizing: border-box; */ /* box-sizing: border-box; */
/*height:150px;*/ /*height:150px;*/
/*display: flex;*/ /*display: flex;*/
/* height:170px; */ /* height:170px; */
/* padding:20px 0 20px 0; */ /* padding:20px 0 20px 0; */
} }
.returnTablePrint .line3 .left { .returnTablePrint .line3 .left {
display: inline-block; display: inline-block;
width: 25%; width: 25%;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
position: relative; position: relative;
line-height: 70px; line-height: 81px;
} }
.returnTablePrint .line3 .left{
.returnTablePrint .line3 .left {
border-right: 1px solid #7f7f7f; border-right: 1px solid #7f7f7f;
/*padding-bottom: 40px;*/ /*padding-bottom: 40px;*/
} }
.returnTablePrint .line3 .left:last-child{
.returnTablePrint .line3 .left:last-child {
border-right: none; border-right: none;
/*padding-bottom: 40px;*/ /*padding-bottom: 40px;*/
} }
.returnTablePrint .line3 .left>span { .returnTablePrint .line3 .left>span {
text-indent: 10px; text-indent: 10px;
} }
.returnTablePrint .line3 .left>span{
.returnTablePrint .line3 .left>span {
display: block; display: block;
/* margin: 15px 0px; */ /* margin: 15px 0px; */
} }
.returnTablePrint .line3 .left>span>span:nth-child(2){
.returnTablePrint .line3 .left>span>span:nth-child(2) {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
} }
.returnTablePrint .line3 i{
.returnTablePrint .line3 i {
display: block; display: block;
text-align: right; text-align: right;
position: absolute; position: absolute;
...@@ -194,82 +225,108 @@ ...@@ -194,82 +225,108 @@
bottom: 5px; bottom: 5px;
font-style: normal; font-style: normal;
} }
.returnTablePrint .line3 i>span>span{
.returnTablePrint .line3 i>span>span {
display: block; display: block;
} }
.returnTablePrint>>>.el-scrollbar__wrap { .returnTablePrint>>>.el-scrollbar__wrap {
overflow-x: hidden; overflow-x: hidden;
margin-bottom:0; margin-bottom: 0;
} }
.returnTablePrint .checkName span:nth-child(2){
.returnTablePrint .checkName span:nth-child(2) {
color: #4a475d; color: #4a475d;
display: inline-block; display: inline-block;
margin-left: 20px; margin-left: 20px;
} }
.returnTablePrint>>>.el-table tbody .cell{
.returnTablePrint>>>.el-table tbody .cell {
color: #141414; color: #141414;
} }
.returnTablePrint .label{
.returnTablePrint .label {
color: #646464; color: #646464;
font-size: 12px;; font-size: 12px;
;
} }
.returnTablePrint .value{
.returnTablePrint .value {
color: #000; color: #000;
font-size: 12px;; font-size: 12px;
;
} }
.returnTablePrint .main-title { .returnTablePrint .main-title {
font-size: 20px; font-size: 17px;
color: #000000; color: #000000;
/* margin-bottom: 20px; */ /* margin-bottom: 20px; */
text-align: center; text-align: center;
} }
.returnTablePrint .footer{
.returnTablePrint .footer {
display: flex; display: flex;
justify-content:flex-end; justify-content: flex-end;
padding:0 40px; padding: 0 40px;
box-sizing: border-box; box-sizing: border-box;
} }
.button-submit{
margin-left:50px; .button-submit {
margin-left: 50px;
} }
table.altrowstable { table.altrowstable {
width: 100%; width: 100%;
font-size:11px; font-size: 11px;
color:#141414; color: #141414;
border-width: 0px; border-width: 0px;
border-color: #a9c6c9; border-color: #a9c6c9;
border-collapse: collapse; border-collapse: collapse;
text-align: center; text-align: center;
table-layout: fixed; table-layout: fixed;
word-break:break-all; word-break: break-all;
} }
table.altrowstable th { table.altrowstable th {
border-width: 0px; border-width: 0px;
padding: 5px;
border-style: solid; border-style: solid;
border-color: #a9c6c9; border-color: #a9c6c9;
background-color: #dedede; background-color: #dedede;
height: 20px;
line-height: 20px;
font-size: 10px;
} }
table.altrowstable td { table.altrowstable td {
border-width: 0px; border-width: 0px;
padding: 2px 5px; height: 20px;
line-height: 20px;
font-size: 10px;
/*border-style: solid;*/ /*border-style: solid;*/
/*border-color: #a9c6c9;*/ /*border-color: #a9c6c9;*/
border: 1px solid #bebebe; border: 1px solid #bebebe;
word-break:break-all; word-break: break-all;
word-wrap : break-word; word-wrap: break-word;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.oddrowcolor{
background-color:#fff; .oddrowcolor {
background-color: #fff;
} }
.evenrowcolor{
background-color:#fafafa; .evenrowcolor {
background-color: #fafafa;
} }
tr:nth-child(odd) { tr:nth-child(odd) {
background: #fafafa; background: #fafafa;
} }
</style> </style>
</head> </head>
<body> <body>
...@@ -284,14 +341,14 @@ ...@@ -284,14 +341,14 @@
${title} ${title}
</span> </span>
</div> </div>
<div style="width:100%;text-align:left"> <div style="width:100%;text-align:left;font-size: 1px;margin-bottom: 2px;">
<div style="text-align:left;display: inline-block; width: 32%" class="number"> <div style="text-align:left;display: inline-block; width: 33%" class="number">
<span class="number">${number}</span> <span class="number">${number}</span>
</div> </div>
<div style="text-align:center;display: inline-block; width: 32%" class="number"> <div style="text-align:center;display: inline-block; width: 33%" class="number">
<span >${ul}</span> <span>(${ul})</span>
</div> </div>
<div style="text-align:right;display: inline-block; width: 28%" class="number"> <div style="text-align:right;display: inline-block; width: 33%" class="number">
<span>机密</span> <span>机密</span>
</div> </div>
</div> </div>
...@@ -310,21 +367,30 @@ ...@@ -310,21 +367,30 @@
<div class="line2 tableList"> <div class="line2 tableList">
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" id="alternatecolor">
<tr> <tr>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 420px;">装备序列号</th><th>备注</th> <th>序号</th>
<th>型号</th>
<th>形态</th>
<th>密级</th>
<th>应用领域</th>
<th>数量</th>
<th>装备序列号</th>
<th>备注</th>
</tr> </tr>
<#list documentDevices as dev> <#list documentDevices as dev>
<tr> <tr>
<td> <td>
<#if dev.code != 0> <!--<#if dev.code !=0>-->
${dev.code} ${dev.code!}
</#if> <!--</#if>-->
</td> </td>
<td>${dev.model!}</td><td>${dev.category!}</td><td>${dev.securityClassification!}</td><td>${dev.applicationField!}</td> <td>${dev.model!}</td>
<td>${dev.category!}</td>
<td>${dev.securityClassification!}</td>
<td>${dev.applicationField!}</td>
<td> <td>
<#if dev.count != 0> ${dev.count!}
${dev.count} </td>
</#if> <td>${dev.deviceSerialNumber!}</td>
</td><td>${dev.deviceSerialNumber!}</td>
<td>${dev.remark!}</td> <td>${dev.remark!}</td>
</tr> </tr>
</#list> </#list>
...@@ -361,8 +427,12 @@ ...@@ -361,8 +427,12 @@
</div> </div>
</div> </div>
</div> </div>
<p class="bottomTxt">第${page}页/共${count}页</p > <div>
<p class="bottomTxt" style="float: left;">注：编号连续使用＂-＂省略</p>
<p class="bottomTxt" style="float: right;">第${page}页/共${count}页</p>
</div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
dev-union/src/main/resources/bill2.html
浏览文件 @ 1acf5f4f
<!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>
<style> <style>
body{ body {
font-family:SimHei; margin: 0;
padding: 0;
font-family: SimHei;
} }
.bottomTxt { .bottomTxt {
text-align: center; text-align: center;
font-size: 10px; font-size: 10px;
...@@ -14,9 +18,10 @@ ...@@ -14,9 +18,10 @@
height: 10px; height: 10px;
line-height: 10px; line-height: 10px;
} }
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/ /*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page { @page {
size:210mm 297mm; size: 210mm 297mm;
/*margin: 0.25in;*/ /*margin: 0.25in;*/
/*-fs-flow-bottom: "footer";*/ /*-fs-flow-bottom: "footer";*/
/*-fs-flow-left: "left";*/ /*-fs-flow-left: "left";*/
...@@ -24,14 +29,16 @@ ...@@ -24,14 +29,16 @@
/*border: thin solid black;*/ /*border: thin solid black;*/
/*padding: 1em;*/ /*padding: 1em;*/
} }
.returnTablePrint{
.returnTablePrint {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
color: #000; color: #000;
cursor: default; cursor: default;
} }
.returnTablePrint .content{
.returnTablePrint .content {
width: 100%; width: 100%;
height: 100%; height: 100%;
/* background: url("../../../assets/img/detailsBg.png") no-repeat; */ /* background: url("../../../assets/img/detailsBg.png") no-repeat; */
...@@ -39,14 +46,16 @@ ...@@ -39,14 +46,16 @@
/*padding: 30px;*/ /*padding: 30px;*/
/*box-sizing: border-box;*/ /*box-sizing: border-box;*/
} }
.returnTablePrint .content>div{
.returnTablePrint .content>div {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
/* padding: 30px; */ /* padding: 30px; */
box-sizing: border-box; box-sizing: border-box;
} }
.returnTablePrint .content>p{
.returnTablePrint .content>p {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 22px; font-size: 22px;
...@@ -54,7 +63,7 @@ ...@@ -54,7 +63,7 @@
color: #4a475d; color: #4a475d;
} }
.returnTablePrint .listWrapper{ .returnTablePrint .listWrapper {
/* width: 92%; */ /* width: 92%; */
margin: 0 auto; margin: 0 auto;
/* padding: 0px 20px 20px 20px; */ /* padding: 0px 20px 20px 20px; */
...@@ -62,121 +71,152 @@ ...@@ -62,121 +71,152 @@
/*padding: 10px 30px;*/ /*padding: 10px 30px;*/
box-sizing: border-box; box-sizing: border-box;
} }
.returnTablePrint .list{
.returnTablePrint .list {
/* width: 92%; */ /* width: 92%; */
margin: 0 auto; margin: 0 auto;
/* padding: 0px 20px 20px 20px; */ /* padding: 0px 20px 20px 20px; */
/* height: calc(100% - 75px); */ /* height: calc(100% - 75px); */
height:calc(100% - 12px) height: calc(100% - 12px)
} }
.returnTablePrint .title{
.returnTablePrint .title {
width: 100%; width: 100%;
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
position: relative; position: relative;
margin: 0 0 15px; margin: 0;
padding:0 20px; padding: 0;
box-sizing: border-box; box-sizing: border-box;
margin-top: 9px;
} }
.returnTablePrint .title span:nth-child(2){
.returnTablePrint .title span:nth-child(2) {
font-size: 28px; font-size: 28px;
color: #000000; color: #000000;
} }
.returnTablePrint .title span:nth-child(2) span{
.returnTablePrint .title span:nth-child(2) span {
font-size: 20px; font-size: 20px;
color: #141414; color: #141414;
} }
.returnTablePrint .main-title { .returnTablePrint .main-title {
font-size: 22px; font-size: 17px;
color: #000000; color: #000000;
margin-bottom: 20px;
text-align: center; text-align: center;
} }
table.altrowstable { table.altrowstable {
width: 100%; width: 100%;
font-size:14px; font-size: 14px;
color:#141414; color: #141414;
border-width: 0px; border-width: 0px;
border-color: #a9c6c9; border-color: #a9c6c9;
border-collapse: collapse; border-collapse: collapse;
text-align: center; text-align: center;
table-layout: fixed; table-layout: fixed;
word-break:break-all; word-break: break-all;
} }
table.altrowstable th { table.altrowstable th {
border-width: 0px; border-width: 0px;
padding: 8px; padding: 8px;
border-style: solid; border-style: solid;
border-color: #a9c6c9; border-color: #a9c6c9;
background-color: #dedede; background-color: #dedede;
height: 20px;
line-height: 20px;
font-size: 10px;
} }
table.altrowstable td { table.altrowstable td {
border-width: 0px; border-width: 0px;
padding: 8px; padding: 8px;
border-style: solid; border-style: solid;
border-color: #a9c6c9; border-color: #a9c6c9;
word-break:break-all; word-break: break-all;
word-wrap : break-word; word-wrap: break-word;
height: 20px;
line-height: 20px;
font-size: 10px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.oddrowcolor{
background-color:#fff; .oddrowcolor {
background-color: #fff;
} }
.evenrowcolor{
background-color:#fafafa; .evenrowcolor {
background-color: #fafafa;
} }
.person{
.person {
color: #4a475b; color: #4a475b;
text-align: right; text-align: right;
font-size: 16px; font-size: 16px;
} }
.person > span{
.person>span {
display: inline-block; display: inline-block;
margin-right: 30pt; margin-right: 30pt;
} }
tr:nth-child(odd) { tr:nth-child(odd) {
background: #fafafa; background: #fafafa;
} }
</style> </style>
</head> </head>
<body> <body>
<div class="returnTablePrint"> <div class="returnTablePrint">
<div class="content"> <div class="content">
<div> <div>
<div class="listWrapper"> <div class="listWrapper">
<div class="list"> <div class="list">
<p class="title"> <p class="title" style="margin-bottom:20px">
<div class="main-title"> <div class="main-title">
<span> <span>
${title} ${title}
</span> </span>
</div> </div>
</p> </p>
<div style="height: 825px;"> <div style="height: 900px;">
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" id="alternatecolor">
<tr> <tr>
<th>序号</th><th style="width: 150px;">型号</th><th>形态</th><th>密级</th><th>应用领域</th><th style="width: 150px;">装备序列号</th> <th>序号</th>
<th style="width: 150px;">型号</th>
<th>形态</th>
<th>密级</th>
<th>应用领域</th>
<th style="width: 150px;">装备序列号</th>
</tr> </tr>
<#list documentDevices as dev> <#list documentDevices as dev>
<tr> <tr>
<td> <td>
<#if dev.code != 0> ${dev.code!}
${dev.code}
</#if>
</td> </td>
<td>${dev.model}</td><td>${dev.category}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.deviceSerialNumber}</td> <td>${dev.model}</td>
<td>${dev.category}</td>
<td>${dev.securityClassification}</td>
<td>${dev.applicationField}</td>
<td>${dev.deviceSerialNumber}</td>
</tr> </tr>
</#list> </#list>
</table> </table>
</div> </div>
</div> </div>
<p class="person" style="margin-top: 20px"> <p class="person" style="margin-top: 20px;font-size: 10px;">
<span style="width: 200px;text-align: left">经办人：</span> <span style="width: 200px;text-align: left">经办人：</span>
<span style="width: 200px;text-align: left">审核人：</span> <span style="width: 200px;text-align: left">审核人：</span>
</p> </p>
</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){-->
...@@ -200,4 +240,5 @@ ...@@ -200,4 +240,5 @@
<!--}--> <!--}-->
<!--</script>--> <!--</script>-->
</body> </body>
</html> </html>
\ No newline at end of file
dev-union/src/main/resources/bill22222.html 0 → 100644
浏览文件 @ 1acf5f4f
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<title>Document</title>
<style>
body{
font-family:SimHei;
margin: 0;
padding: 0;
}
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page {
size:297mm 210mm;
}
.bottomTxt {
text-align: center;
font-size: 10px;
color: #646464;
height: 10px;
line-height: 10px;
}
.returnTablePrint{
width: 100%;
height: 100%;
overflow: hidden;
color: #000;
cursor: default;
}
.returnTablePrint .content{
width: 100%;
height: 100%;
}
.returnTablePrint .content>div{
width: 100%;
height: 100%;
background: #fff;
/* padding: 30px; */
box-sizing: border-box;
}
/* .returnTablePrint .content>p{
width: 100%;
text-align: center;
font-size: 22px;
font-weight: bold;
color: #4a475d;
} */
.returnTablePrint .listWrapper{
/*margin: 0 auto;*/
/* height: calc(100% - 40px); */
box-sizing: border-box;
}
.returnTablePrint .list{
/*margin: 0 auto;*/
height:calc(100% - 12px)
}
.returnTablePrint .title{
width: 100%;
font-size: 22px;
text-align: center;
position: relative;
/* margin: 0 0 15px; */
padding:0 20px;
box-sizing: border-box;
}
/* .returnTablePrint .title span:nth-child(2){
font-size: 28px;
color: #000000;
}
.returnTablePrint .title span:nth-child(2) span{
font-size: 20px;
color: #141414;
} */
.returnTablePrint .title .number{
font-size: 12px;
color: #646464;
}
/* .returnTablePrint .other{
width: 100%;
color: #141414;
font-size: 20px;
margin-top: 20px;
padding-left: 50px;
position: relative;
box-sizing: border-box;
margin-bottom: 20px;
}
.returnTablePrint .other>span span:nth-child(2){
display: inline-block;
margin:0 40px 0 10px;
} */
.returnTablePrint .listCon{
height: 100%;
border: 1px solid #7f7f7f;
}
.returnTablePrint .line1{
width: 100%;
font-size: 12px;
box-sizing: border-box;
border-bottom: 1px solid #7f7f7f;
color:#000;
line-height: 20px;
}
.returnTablePrint .line1 .sendTo {
display: inline-block;
width: 49%;
text-indent: 5px;
box-sizing: border-box;
/*padding-left: 20px;*/
}
.returnTablePrint .line1 .sendNum {
display: inline-block;
width: 49%;
box-sizing: border-box;
/*padding-left: 20px;*/
}
.returnTablePrint .line1 .sendTo{
border-right: 1px solid #7f7f7f;
}
.returnTablePrint .line1 .sendTo span:nth-child(2),.returnTablePrint .line1 .sendNum span:nth-child(2){
color: #4a475d;
display: inline-block;
margin-left: 5px;
}
.returnTablePrint .line2{
height: 100%;
/* padding: 20px; */
border-bottom: 1px solid #7f7f7f;
}
.returnTablePrint .tableList{
height: 500px;
}
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff;
}
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) {
background-color:#fff;
}
.returnTablePrint .line3{
width: 100%;
}
.returnTablePrint .line3 .left {
display: inline-block;
width: 49%;
box-sizing: border-box;
position: relative;
/* padding-bottom: 80px; */
}
.returnTablePrint .line3 .right {
display: inline-block;
width: 49%;
box-sizing: border-box;
position: relative;
/* padding-bottom: 80px; */
}
.returnTablePrint .line3 .left{
border-right: 1px solid #7f7f7f;
height: 96px;
}
.returnTablePrint .line3 .left>span {
text-indent: 10px;
}
.returnTablePrint .line3 .left>span,.returnTablePrint .line3 .right>span{
display: block;
margin: 6px 0px;
}
.returnTablePrint .line3 .right{
height: 100%;
height: 96px;
}
.returnTablePrint .line3 .left>span>span:nth-child(2),.returnTablePrint .line3 .right>span>span:nth-child(2){
display: inline-block;
margin-left: 20px;
}
.returnTablePrint .line3 i{
display: block;
text-align: right;
position: absolute;
right: 5px;
bottom: 5px;
font-style: normal;
font-size: 12px;
}
.returnTablePrint .line3 .right i{
font-style: normal;
}
.returnTablePrint .line3 i>span>span{
display: block;
}
.returnTablePrint>>>.el-scrollbar__wrap {
overflow-x: hidden;
margin-bottom:0;
}
.returnTablePrint .checkName span:nth-child(2){
color: #4a475d;
display: inline-block;
margin-left: 20px;
}
.returnTablePrint>>>.el-table tbody .cell{
color: #141414;
}
.returnTablePrint .label{
color: #646464;
font-size: 12px;
}
.returnTablePrint .value{
color: #000;
font-size: 12px;
}
.returnTablePrint .main-title {
font-size: 20px;
color: #000000;
line-height: 20px;
text-align: center;
}
.returnTablePrint .footer{
display: flex;
justify-content:flex-end;
padding:0 40px;
box-sizing: border-box;
}
.button-submit{
margin-left:50px;
}
table.altrowstable {
width: 100%;
font-size: 11px;
color:#141414;
border-width: 0px;
border-color: #a9c6c9;
border-collapse: collapse;
text-align: center;
table-layout: fixed;
word-break: break-all;
}
table.altrowstable th {
border-width: 0px;
padding: 5px;
border-style: solid;
border-color: #a9c6c9;
background-color: #dedede;
}
table.altrowstable td {
border-width: 0px;
padding: 2px 5px;
/*border-style: solid;*/
/*border-color: #a9c6c9;*/
word-break: break-all;
word-wrap: break-word;
border-bottom: 1px solid #bebebe;
}
.leftImg {
position: absolute;
top: -53px;
right: 85px;
}
.rightImg {
position: absolute;
bottom: 0px;
right: 70px;
}
.oddrowcolor{
background-color:#fff;
}
.evenrowcolor{
background-color:#fafafa;
}
/*tr:nth-child(odd) {*/
/* background: #fafafa;*/
/*}*/
</style>
</head>
<body>
<div class="returnTablePrint">
<div class="content">
<div>
<div class="listWrapper">
<div class="list">
<div class="title">
<div class="main-title">
<span>
${title}
</span>
</div>
<div style="width:100%;text-align:left">
<div style="text-align:left;display: inline-block; width: 32%" class="number">
<span class="number">${number}</span>
</div>
<div style="text-align:center;display: inline-block; width: 32%" class="number">
<span >${ul}</span>
</div>
<div style="text-align:right;display: inline-block; width: 28%" class="number">
<span>机密</span>
</div>
</div>
</div>
<div class="listCon">
<div class="line1">
<span class="sendTo">
<span>发往:</span>
<span>${receiveUnit}</span>
</span>
<span class="sendNum">
<span>批复文号:</span>
<span>${replyNum}</span>
</span>
</div>
<div class="line2 tableList">
<table class="altrowstable" id="alternatecolor">
<tr>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 420px;">装备序列号</th><th>备注</th>
</tr>
<#list documentDevices as dev>
<tr>
<td>
<#if dev.code != 0>
${dev.code}
</#if>
</td>
<td>${dev.model!}</td><td>${dev.category!}</td><td>${dev.securityClassification!}</td><td>${dev.applicationField!}</td>
<td>
<#if dev.count != 0>
${dev.count}
</#if>
</td>
<td>${dev.deviceSerialNumber!}</td>
<td>${dev.remark!}</td>
</tr>
</#list>
</table>
</div>
<div class="line3">
<span class="left">
<span>
<span class="label">发件单位:</span>
<span class="value">${senderUnit}</span>
</span>
<span>
<span class="label">签发人:</span>
<span class="value">${nameA1!}</span>
</span>
<span>
<span class="label">经办人:</span>
<span class="value">${nameA!}</span>
</span>
<i>
<span style="position: relative;color: #646464">
<span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span>
<div class="leftImg">
<div id="pos0" >
<img style="width:80px;height:80px" src=${srcA} class="" id=""/>
</div>
</div>
</span>
</i>
</span>
<span class="right">
<span>
<span class="label">收件单位:</span>
<span class="value">${receiveUnit}</span>
</span>
<span>
<span class="label">经办人:</span>
<span class="value">${nameB!}</span>
</span>
<span>
<span class="label">经办人:</span>
<span class="value">${nameB1!}</span>
</span>
<i>
<span style="color: #646464">
<span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span>
<div class="rightImg">
<div id="pos1" >
<img style="width:80px;height:80px" src=${srcB}/>
</div>
</div>
</span>
</i>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<p class="bottomTxt">第${page}页/共${count}页</p >
</div>
<!--<script type="text/javascript">-->
<!--function altRows(id){-->
<!--if(document.getElementsByTagName){-->
<!--var table = document.getElementById(id);-->
<!--var rows = table.getElementsByTagName("tr");-->
<!--for(i = 0; i < rows.length; i++){-->
<!--if(i % 2 == 0){-->
<!--rows[i].className = "evenrowcolor";-->
<!--}else{-->
<!--rows[i].className = "oddrowcolor";-->
<!--}-->
<!--}-->
<!--}-->
<!--}-->
<!--window.onload=function(){-->
<!--altRows('alternatecolor');-->
<!--}-->
<!--</script>-->
</body>
</html>
\ No newline at end of file
dev-union/src/main/resources/bill3.html
浏览文件 @ 1acf5f4f
<!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>
<style> <style>
body{ body {
font-family:SimHei; font-family: SimHei;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/ /*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page { @page {
size:297mm 210mm; size: 297mm 210mm;
} }
.bottomTxt { .bottomTxt {
text-align: center; text-align: center;
font-size: 10px; font-size: 10px;
...@@ -20,24 +23,28 @@ ...@@ -20,24 +23,28 @@
height: 10px; height: 10px;
line-height: 10px; line-height: 10px;
} }
.returnTablePrint{
.returnTablePrint {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
color: #000; color: #000;
cursor: default; cursor: default;
} }
.returnTablePrint .content{
.returnTablePrint .content {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.returnTablePrint .content>div{
.returnTablePrint .content>div {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
/* padding: 30px; */ /* padding: 30px; */
box-sizing: border-box; box-sizing: border-box;
} }
/* .returnTablePrint .content>p{ /* .returnTablePrint .content>p{
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -46,24 +53,26 @@ ...@@ -46,24 +53,26 @@
color: #4a475d; color: #4a475d;
} */ } */
.returnTablePrint .listWrapper{ .returnTablePrint .listWrapper {
/*margin: 0 auto;*/ /*margin: 0 auto;*/
/* height: calc(100% - 40px); */ /* height: calc(100% - 40px); */
box-sizing: border-box; box-sizing: border-box;
} }
.returnTablePrint .list{
.returnTablePrint .list {
/*margin: 0 auto;*/ /*margin: 0 auto;*/
height:calc(100% - 12px) height: calc(100% - 12px)
} }
.returnTablePrint .title{
.returnTablePrint .title {
width: 100%; width: 100%;
font-size: 22px; font-size: 22px;
text-align: center; text-align: center;
position: relative; position: relative;
/* margin: 0 0 15px; */ /* margin: 0 0 15px; */
padding:0 20px;
box-sizing: border-box; box-sizing: border-box;
} }
/* .returnTablePrint .title span:nth-child(2){ /* .returnTablePrint .title span:nth-child(2){
font-size: 28px; font-size: 28px;
color: #000000; color: #000000;
...@@ -72,10 +81,11 @@ ...@@ -72,10 +81,11 @@
font-size: 20px; font-size: 20px;
color: #141414; color: #141414;
} */ } */
.returnTablePrint .title .number{ .returnTablePrint .title .number {
font-size: 12px; font-size: 10px;
color: #646464; color: #646464;
} }
/* .returnTablePrint .other{ /* .returnTablePrint .other{
width: 100%; width: 100%;
color: #141414; color: #141414;
...@@ -91,18 +101,20 @@ ...@@ -91,18 +101,20 @@
display: inline-block; display: inline-block;
margin:0 40px 0 10px; margin:0 40px 0 10px;
} */ } */
.returnTablePrint .listCon{ .returnTablePrint .listCon {
height: 100%; height: 100%;
border: 1px solid #7f7f7f; border: 1px solid #7f7f7f;
} }
.returnTablePrint .line1{
.returnTablePrint .line1 {
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
color:#000; color: #000;
line-height: 20px; line-height: 20px;
} }
.returnTablePrint .line1 .sendTo { .returnTablePrint .line1 .sendTo {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
...@@ -110,106 +122,130 @@ ...@@ -110,106 +122,130 @@
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
} }
.returnTablePrint .line1 .sendNum { .returnTablePrint .line1 .sendNum {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
} }
.returnTablePrint .line1 .sendTo{
.returnTablePrint .line1 .sendTo {
border-right: 1px solid #7f7f7f; border-right: 1px solid #7f7f7f;
} }
.returnTablePrint .line1 .sendTo span:nth-child(2),.returnTablePrint .line1 .sendNum span:nth-child(2){
.returnTablePrint .line1 .sendTo span:nth-child(2),
.returnTablePrint .line1 .sendNum span:nth-child(2) {
color: #4a475d; color: #4a475d;
display: inline-block; display: inline-block;
margin-left: 5px; margin-left: 5px;
} }
.returnTablePrint .line2{
.returnTablePrint .line2 {
height: 100%; height: 100%;
/* padding: 20px; */ /* padding: 20px; */
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
} }
.returnTablePrint .tableList{
height: 546px; .returnTablePrint .tableList {
height: 514px;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff; background-color: #fff;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(even) {
background-color:#fff; background-color: #fff;
} }
.returnTablePrint .line3{
.returnTablePrint .line3 {
width: 100%; width: 100%;
height:70px; height: 94px;
/* box-sizing: border-box; */ /* box-sizing: border-box; */
/*height:150px;*/ /*height:150px;*/
/*display: flex;*/ /*display: flex;*/
/* height:170px; */ /* height:170px; */
/* padding:20px 0 20px 0; */ /* padding:20px 0 20px 0; */
} }
.returnTablePrint .line3 .left { .returnTablePrint .line3 .left {
display: inline-block; display: inline-block;
width: 25%; width: 25%;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
position: relative; position: relative;
line-height: 70px; line-height: 94px;
} }
.returnTablePrint .line3 .left{
.returnTablePrint .line3 .left {
border-right: 1px solid #7f7f7f; border-right: 1px solid #7f7f7f;
/*padding-bottom: 40px;*/ /*padding-bottom: 40px;*/
} }
.returnTablePrint .line3 .left:last-child{
.returnTablePrint .line3 .left:last-child {
border-right: none; border-right: none;
/*padding-bottom: 40px;*/ /*padding-bottom: 40px;*/
} }
.returnTablePrint .line3 .left>span{
.returnTablePrint .line3 .left>span {
display: block; display: block;
/* margin: 15px 0px; */ /* margin: 15px 0px; */
} }
.returnTablePrint .line3 .left>span>span:nth-child(2){
.returnTablePrint .line3 .left>span>span:nth-child(2) {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
} }
.returnTablePrint>>>.el-scrollbar__wrap { .returnTablePrint>>>.el-scrollbar__wrap {
overflow-x: hidden; overflow-x: hidden;
margin-bottom:0; margin-bottom: 0;
} }
.returnTablePrint .checkName span:nth-child(2){
.returnTablePrint .checkName span:nth-child(2) {
color: #4a475d; color: #4a475d;
display: inline-block; display: inline-block;
margin-left: 20px; margin-left: 20px;
} }
.returnTablePrint>>>.el-table tbody .cell{
.returnTablePrint>>>.el-table tbody .cell {
color: #141414; color: #141414;
} }
.returnTablePrint .label{
.returnTablePrint .label {
color: #646464; color: #646464;
font-size: 12px; font-size: 10px;
} }
.returnTablePrint .value{
.returnTablePrint .value {
color: #000; color: #000;
font-size: 12px; font-size: 10px;
} }
.returnTablePrint .main-title { .returnTablePrint .main-title {
font-size: 20px; font-size: 17px;
color: #000000; color: #000000;
line-height: 20px; line-height: 17px;
text-align: center; text-align: center;
margin-top: 9px;
} }
.returnTablePrint .footer{
.returnTablePrint .footer {
display: flex; display: flex;
justify-content:flex-end; justify-content: flex-end;
padding:0 40px; padding: 0 40px;
box-sizing: border-box; box-sizing: border-box;
} }
.button-submit{
margin-left:50px; .button-submit {
margin-left: 50px;
} }
table.altrowstable { table.altrowstable {
width: 100%; width: 100%;
font-size: 11px; font-size: 11px;
color:#141414; color: #141414;
border-width: 0px; border-width: 0px;
border-color: #a9c6c9; border-color: #a9c6c9;
border-collapse: collapse; border-collapse: collapse;
...@@ -217,34 +253,49 @@ ...@@ -217,34 +253,49 @@
table-layout: fixed; table-layout: fixed;
word-break: break-all; word-break: break-all;
} }
table.altrowstable th { table.altrowstable th {
border-width: 0px; border-width: 0px;
padding: 5px; padding: 5px;
border-style: solid; border-style: solid;
border-color: #a9c6c9; border-color: #a9c6c9;
background-color: #dedede; background-color: #dedede;
word-break:break-all; word-break: break-all;
height: 20px;
line-height: 20px;
font-size: 10px;
} }
table.altrowstable td { table.altrowstable td {
border-width: 0px; border-width: 0px;
padding: 5px; height: 20px;
line-height: 20px;
font-size: 10px;
/*border-style: solid;*/ /*border-style: solid;*/
/*border-color: #a9c6c9;*/ /*border-color: #a9c6c9;*/
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
border-bottom: 1px solid #bebebe; border-bottom: 1px solid #bebebe;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.oddrowcolor{
background-color:#fff; .oddrowcolor {
background-color: #fff;
} }
.evenrowcolor{
background-color:#fafafa; .evenrowcolor {
background-color: #fafafa;
} }
/*tr:nth-child(odd) {*/ /*tr:nth-child(odd) {*/
/* background: #fafafa;*/ /* background: #fafafa;*/
/*}*/ /*}*/
</style> </style>
</head> </head>
<body> <body>
...@@ -259,14 +310,14 @@ ...@@ -259,14 +310,14 @@
工作交接单2 工作交接单2
</span> </span>
</div> </div>
<div style="width:100%;text-align:left"> <div style="width:100%;text-align:left;font-size: 1px;margin-bottom:20px">
<div style="text-align:left;display: inline-block; width: 32%" class="number"> <div style="text-align:left;display: inline-block; width: 49%" class="number">
<span class="number">时间：${time}</span> <span class="number">时间：${time}</span>
</div> </div>
<div style="text-align:center;display: inline-block; width: 32%" class="number"> <!-- <div style="text-align:center;display: inline-block; width: 34%" class="number">
<span></span> <span></span>
</div> </div> -->
<div style="text-align:right;display: inline-block; width: 28%" class="number"> <div style="text-align:right;display: inline-block; width: 50%" class="number">
<span>机密</span> <span>机密</span>
</div> </div>
</div> </div>
...@@ -275,16 +326,29 @@ ...@@ -275,16 +326,29 @@
<div class="line2 tableList"> <div class="line2 tableList">
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" id="alternatecolor">
<tr> <tr>
<th>序号</th><th>型号</th><th>名称</th><th>在库</th><th>维修</th><th>报废</th><th>清退</th><th>其他</th><th style="width: 420px;">装备序列号</th> <th>序号</th>
<th>型号</th>
<th>名称</th>
<th>在库</th>
<th>维修</th>
<th>报废</th>
<th>清退</th>
<th>其他</th>
<th >装备序列号</th>
</tr> </tr>
<#list documentDevices as dev> <#list documentDevices as dev>
<tr> <tr>
<td> <td>
<#if dev.code != 0> ${dev.code!}
${dev.code}
</#if>
</td> </td>
<td>${dev.model}</td><td>${dev.name}</td><td>${dev.inLibraryNum}</td><td>${dev.repairNum}</td><td>${dev.scrappedNum}</td><td>${dev.retiredNum}</td><td>${dev.otherNum}</td><td>${dev.seqs}</td> <td>${dev.model}</td>
<td>${dev.name}</td>
<td>${dev.inLibraryNum}</td>
<td>${dev.repairNum}</td>
<td>${dev.scrappedNum}</td>
<td>${dev.retiredNum}</td>
<td>${dev.otherNum}</td>
<td>${dev.seqs}</td>
</tr> </tr>
</#list> </#list>
</table> </table>
...@@ -292,25 +356,29 @@ ...@@ -292,25 +356,29 @@
<div class="line3" style="position: relative;"> <div class="line3" style="position: relative;">
<span class="left"> <span class="left">
<span> <span>
<span style="position: absolute; top: -20px; left: 8px;" class="label">交接人:</span> <span style="position: absolute; top: -20px; left: 8px;"
class="label">交接人:</span>
<span class="value"></span> <span class="value"></span>
</span> </span>
</span> </span>
<span class="left"> <span class="left">
<span> <span>
<span style="position: absolute; top: -20px; left: 8px;" class="label" >移交人:</span> <span style="position: absolute; top: -20px; left: 8px;"
class="label">移交人:</span>
<span class="value"></span> <span class="value"></span>
</span> </span>
</span> </span>
<span class="left" style="width: 23%;"> <span class="left" style="width: 23%;">
<span> <span>
<span style="position: absolute; top: -20px; left: 8px;" class="label">监交人:</span> <span style="position: absolute; top: -20px; left: 8px;"
class="label">监交人:</span>
<span class="value"></span> <span class="value"></span>
</span> </span>
</span> </span>
<span class="left" style="width: 23%;"> <span class="left" style="width: 23%;">
<span> <span>
<span style="position: absolute; top: -20px; left: 8px;" class="label" >上级领导:</span> <span style="position: absolute; top: -20px; left: 8px;"
class="label">上级领导:</span>
<span class="value"></span> <span class="value"></span>
</span> </span>
</span> </span>
...@@ -344,4 +412,5 @@ ...@@ -344,4 +412,5 @@
<!--}--> <!--}-->
<!--</script>--> <!--</script>-->
</body> </body>
</html> </html>
\ No newline at end of file
dev-user/src/main/java/com/tykj/dev/device/user/base/ret/UserConditionsVo.java
浏览文件 @ 1acf5f4f
package com.tykj.dev.device.user.base.ret; package com.tykj.dev.device.user.base.ret;
import com.tykj.dev.misc.base.CustomPage;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -19,14 +20,13 @@ import lombok.NoArgsConstructor; ...@@ -19,14 +20,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@ApiModel(value = "用户查询条件对象", description = "用户查询条件信息") @ApiModel(value = "用户查询条件对象", description = "用户查询条件信息")
@Builder @Builder
public class UserConditionsVo { public class UserConditionsVo extends CustomPage {
@ApiModelProperty(value = "单位id", name = "unitsId", example = "12321L") @ApiModelProperty(value = "单位id", name = "unitsId", example = "12321L")
private Integer unitsId; private Integer unitsId;
@ApiModelProperty(value = "页码", name = "page", example = "12321L")
private Integer page;
@ApiModelProperty(value = "条数", name = "size", example = "12321L")
private Integer size;
@ApiModelProperty(value = "模糊搜索", name = "dim", example = "12321L") @ApiModelProperty(value = "模糊搜索", name = "dim", example = "12321L")
private String dim; private String dim;
@ApiModelProperty(value = "类型" ,name = "type")
private Integer type;
} }
dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/AreaController.java
浏览文件 @ 1acf5f4f
...@@ -74,4 +74,11 @@ public class AreaController { ...@@ -74,4 +74,11 @@ public class AreaController {
return ResponseEntity.ok(areaService.selectPage(page,size)); return ResponseEntity.ok(areaService.selectPage(page,size));
} }
@GetMapping("/page/{size}")
@ApiOperation(value = "1111111", notes = "成功返回区域对象")
public ResponseEntity selectPage1( @PathVariable Integer size){
return ResponseEntity.ok(areaService.findIdQuerySubordinateIds(size));
}
} }
dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UserArchivesController.java
浏览文件 @ 1acf5f4f
...@@ -44,7 +44,7 @@ public class UserArchivesController { ...@@ -44,7 +44,7 @@ public class UserArchivesController {
@Autowired @Autowired
LogoutUtil logout; LogoutUtil logout;
//
@PostMapping(value = "/archives/summary/page") @PostMapping(value = "/archives/summary/page")
@ApiOperation(value = "根据单位id查询用户接口(分页)", notes = "成功返回用户对象集合") @ApiOperation(value = "根据单位id查询用户接口(分页)", notes = "成功返回用户对象集合")
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/AreaService.java
浏览文件 @ 1acf5f4f
...@@ -32,4 +32,6 @@ public interface AreaService extends PublicService<Area> { ...@@ -32,4 +32,6 @@ public interface AreaService extends PublicService<Area> {
Area findByid(Integer areaId); Area findByid(Integer areaId);
List<Integer> findIdQuerySubordinateIds(Integer areaId);
} }
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/AreaServiceImpl.java
浏览文件 @ 1acf5f4f
...@@ -120,6 +120,25 @@ public class AreaServiceImpl implements AreaService { ...@@ -120,6 +120,25 @@ public class AreaServiceImpl implements AreaService {
return areaDao.findById(areaId).get(); return areaDao.findById(areaId).get();
} }
@Override
public List<Integer> findIdQuerySubordinateIds(Integer areaId) {
List<Integer> ids=new ArrayList<>();
return areaId(ids,areaId);
}
private List<Integer> areaId(List<Integer> ids,Integer areaId){
List<Area> areas= areaDao.findAllByFatherId(areaId);
ids.add(areaId);
if (areas!=null&&areas.size()!=0){
areas.forEach(
area -> {
areaId(ids,area.getId());
}
);
}
return ids;
}
private List<UnitsVo> subordinateAllUnits(List<UnitsVo> units, Area area) { private List<UnitsVo> subordinateAllUnits(List<UnitsVo> units, Area area) {
List<Area> list = areaDao.findAllByFatherId(area.getId()); List<Area> list = areaDao.findAllByFatherId(area.getId());
if (list.size() == 0) { if (list.size() == 0) {
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java
浏览文件 @ 1acf5f4f
package com.tykj.dev.device.user.subject.service.impl; package com.tykj.dev.device.user.subject.service.impl;
import com.github.wenhao.jpa.PredicateBuilder;
import com.github.wenhao.jpa.Specifications;
import com.tykj.dev.config.cache.ConfigCache; import com.tykj.dev.config.cache.ConfigCache;
import com.tykj.dev.device.user.base.req.DropDownUserLocation; import com.tykj.dev.device.user.base.req.DropDownUserLocation;
import com.tykj.dev.device.user.base.req.NotIsUser; import com.tykj.dev.device.user.base.req.NotIsUser;
...@@ -14,10 +16,13 @@ import com.tykj.dev.device.user.subject.dao.UserDao; ...@@ -14,10 +16,13 @@ import com.tykj.dev.device.user.subject.dao.UserDao;
import com.tykj.dev.device.user.subject.dao.UserRoleDao; import com.tykj.dev.device.user.subject.dao.UserRoleDao;
import com.tykj.dev.device.user.subject.entity.*; import com.tykj.dev.device.user.subject.entity.*;
import com.tykj.dev.device.user.subject.service.*; import com.tykj.dev.device.user.subject.service.*;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException; import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.SpringUtils; import com.tykj.dev.misc.utils.SpringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -183,36 +188,87 @@ public class UserServiceImpl implements UserService { ...@@ -183,36 +188,87 @@ public class UserServiceImpl implements UserService {
} }
@Override // public UserPage findAllByUnitePage(UserConditionsVo userConditionsVo) {
public UserPage findAllByUnitePage(UserConditionsVo userConditionsVo) { // Integer page = userConditionsVo.getPage();
// Pageable pageable = PageRequest.of(page, size, Sort.Direction.ASC, "seq"); // Integer size = userConditionsVo.getSize();
// Page<User> all = getContacts(unitsId, pageable); // List<MemberThat> memberThats = new ArrayList<>();
// userDao.findAllByUnitsId(userConditionsVo.getUnitsId())
// .stream()
// .filter(user -> user.getTrainStatus()!=5)
// .filter(user ->{
// boolean isNull=userConditionsVo.getDim()!=null;
// if (isNull) {
// boolean isName = user.getName().contains(userConditionsVo.getDim());
// boolean isSex = user.getSex() != 1 ? "男".contains(userConditionsVo.getDim()) : "女".contains(userConditionsVo.getDim());
// boolean isUnit = unitsService.findById(user.getUnitsId()).getName().contains(userConditionsVo.getDim());
// boolean isMobile=user.getMobile()!=null&&user.getMobile().contains(userConditionsVo.getDim());
// boolean isPosition = configCache.getPositionMap().get(user.getPosition()).contains(userConditionsVo.getDim());
// return isName || isSex || isUnit || isPosition||isMobile;
// }else {
// return true;
// }
// })
// .forEach(
// user -> {
// MemberThat memberThat = user.toVo();
// memberThat.setUnitsName(unitsService.findById(user.getUnitsId()).getName());
// Mgrcert mgrcert = mgrcertDao.findByUserId(user.getUserId());
// if (mgrcert != null) {
// memberThat.setCertName(mgrcert.getCertName());
// memberThat.setCertNum(mgrcert.getCertNum());
// memberThat.setIssueDate(mgrcert.getIssueDate());
// memberThat.setExpiryDate(mgrcert.getExpiryDate());
// memberThat.setIsExpiry(mgrcert.getIsExpiry());
// memberThat.setRemaining(mgrcert.getExpiryDate().getTime() - mgrcert.getIssueDate().getTime());
// } else {
// memberThat.setRemaining(0L);
// }
// memberThats.add(memberThat);
// }
// );
//// if (userConditionsVo.getDim()!=null){
//// memberThats= memberThats.stream().filter(memberThat -> memberThat.getName().contains(userConditionsVo.getDim())||memberThat.getSex()==1?"男".contains(userConditionsVo.getDim()):"女".equals(userConditionsVo.getDim())||
//// memberThat.getUnitsName().contains(userConditionsVo.getDim())||memberThat.getPosition()==1?"领导".contains(userConditionsVo.getDim()):"专管员".contains(userConditionsVo.getDim())).collect(Collectors.toList());
//// }
//
// memberThats.sort((o1, o2) -> {
// //升序
// return o2.getRemaining().compareTo(o1.getRemaining());
// });
//
//
// int count = memberThats.size();
// if (size > count) {
// return UserPage.builder() // return UserPage.builder()
// .data(all.getContent()) // .total(count)
// .page(page) // .page(page)
// .size(size) // .size(size)
// .total((int)all.getTotalElements()) // .data(memberThats).build();
// .build(); // }
Integer page = userConditionsVo.getPage(); // int countPage = count / size;
Integer size = userConditionsVo.getSize(); // if (count % size != 0) {
List<MemberThat> memberThats = new ArrayList<>(); // countPage = countPage + 1;
userDao.findAllByUnitsId(userConditionsVo.getUnitsId()) // }
.stream() // if (page >= countPage) {
.filter(user -> user.getTrainStatus()!=5) // return UserPage.builder()
.filter(user ->{ // .total(count)
boolean isNull=userConditionsVo.getDim()!=null; // .page(page)
if (isNull) { // .size(size)
boolean isName = user.getName().contains(userConditionsVo.getDim()); // .data(memberThats.subList((page - 1) * size, count)).build();
boolean isSex = user.getSex() != 1 ? "男".contains(userConditionsVo.getDim()) : "女".contains(userConditionsVo.getDim()); // } else {
boolean isUnit = unitsService.findById(user.getUnitsId()).getName().contains(userConditionsVo.getDim()); // return UserPage.builder()
boolean isMobile=user.getMobile()!=null&&user.getMobile().contains(userConditionsVo.getDim()); // .total(count)
boolean isPosition = configCache.getPositionMap().get(user.getPosition()).contains(userConditionsVo.getDim()); // .page(page)
return isName || isSex || isUnit || isPosition||isMobile; // .size(size)
}else { // .data(memberThats.subList((page - 1) * size, page * size)).build();
return true; // }
} //
}) // }
.forEach( @Override
public UserPage findAllByUnitePage(UserConditionsVo userConditionsVo){
Page<User> userPage= userDao.findAll(getUserSpecification(userConditionsVo),userConditionsVo.getPageable());
List<MemberThat> list=new ArrayList<>();
userPage.getContent().forEach(
user -> { user -> {
MemberThat memberThat = user.toVo(); MemberThat memberThat = user.toVo();
memberThat.setUnitsName(unitsService.findById(user.getUnitsId()).getName()); memberThat.setUnitsName(unitsService.findById(user.getUnitsId()).getName());
...@@ -227,60 +283,33 @@ public class UserServiceImpl implements UserService { ...@@ -227,60 +283,33 @@ public class UserServiceImpl implements UserService {
} else { } else {
memberThat.setRemaining(0L); memberThat.setRemaining(0L);
} }
memberThats.add(memberThat); list.add(memberThat);
} }
); );
// if (userConditionsVo.getDim()!=null){
// memberThats= memberThats.stream().filter(memberThat -> memberThat.getName().contains(userConditionsVo.getDim())||memberThat.getSex()==1?"男".contains(userConditionsVo.getDim()):"女".equals(userConditionsVo.getDim())||
// memberThat.getUnitsName().contains(userConditionsVo.getDim())||memberThat.getPosition()==1?"领导".contains(userConditionsVo.getDim()):"专管员".contains(userConditionsVo.getDim())).collect(Collectors.toList());
// }
memberThats.sort((o1, o2) -> {
//升序
return o2.getRemaining().compareTo(o1.getRemaining());
});
int count = memberThats.size();
if (size > count) {
return UserPage.builder()
.total(count)
.page(page)
.size(size)
.data(memberThats).build();
}
int countPage = count / size;
if (count % size != 0) {
countPage = countPage + 1;
}
if (page >= countPage) {
return UserPage.builder() return UserPage.builder()
.total(count) .total((int)userPage.getTotalElements())
.page(page) .page(userPage.getPageable().getPageNumber())
.size(size) .size(userPage.getPageable().getPageSize())
.data(memberThats.subList((page - 1) * size, count)).build(); .data(list).build();
} else { }
return UserPage.builder()
.total(count) private Specification<User> getUserSpecification(UserConditionsVo userConditionsVo) {
.page(page) PredicateBuilder<User> predicateBuilder = Specifications.and();
.size(size) if (userConditionsVo.getType()==1){
.data(memberThats.subList((page - 1) * size, page * size)).build(); List<Integer> ids= areaService.findIdQuerySubordinateIds(userConditionsVo.getUnitsId());
List<Integer> unitIds= unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList());
predicateBuilder.in("unitsId",unitIds.toArray());
}else {
predicateBuilder.eq("unitsId",userConditionsVo.getUnitsId());
} }
return predicateBuilder.build();
} }
// private Page<User> getContacts(Integer depId, Pageable pageable) {
// Specification<User> contactSpecification = new Specification<User>() {
// @Override
// public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) {
// Predicate predicate = criteriaBuilder.equal(root.get("department"), depId);
// Predicate status = criteriaBuilder.equal(root.get("status"), "1");
// return criteriaBuilder.and(predicate, status);
// }
// };
// return userDao.findAll(contactSpecification, pageable);
// }
@Override @Override
public Integer updatePw(UserUpdatePw userUpdatePw) { public Integer updatePw(UserUpdatePw userUpdatePw) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论