Skip to content

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

[bill] 模版添加

上级 3de7475e
隐藏空白字符变更
内嵌 并排
正在显示 包含 105 行增加 和 14 行删除
dev-union/src/main/resources/bill.html
浏览文件 @ 2a589200
......@@ -157,7 +157,7 @@
}
.returnTablePrint .tableList {
height: 404px;
height: 375px;
overflow:hidden;
}
......@@ -323,10 +323,45 @@ line-height:25px;
table-layout: fixed;
word-break: break-all;
}
.td2{
height: 49px !important;
}
.td3{
height: 74px !important;
}
.td4{
height: 99px !important;
}
.td5{
height: 124px !important;
}
.td6{
height: 149px !important;
}
.td7{
height: 174px !important;
}
.td8{
height: 199px !important;
}
.td9{
height: 224px !important;
}
.td10{
height: 249px !important;
}
.td11{
height: 274px !important;
}
.td12{
height: 299px !important;
}
.td13{
height: 324px !important;
}
table.altrowstable th {
height: 25px;
line-height:26px;
height: 24px;
line-height:24px;
font-size: 15px;
background-color: #ebebeb;
marign-top:none;
......@@ -336,8 +371,8 @@ border:1px solid #bebebe;
}
table.altrowstable td {
height: 25px;
line-height:26px;
height: 24px;
line-height:24px;
font-size: 15px;
word-break: break-all;
word-wrap: break-word;
......@@ -362,8 +397,8 @@ border:1px solid #bebebe;
position: absolute;
bottom: 0px;
right: 150px;
}
.oddrowcolor {
background-color: #fff;
}
......@@ -440,7 +475,47 @@ border:1px solid #bebebe;
<td>
${dev.count!}
</td>
<#if dev.oneCount == 1>
<td>${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 2>
<td class="td2">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 3>
<td class="td3">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 4>
<td class="td4">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 5>
<td class="td5">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 6>
<td class="td6">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 7>
<td class="td7">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 8>
<td class="td8">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 9>
<td class="td9">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 10>
<td class="td10">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 11>
<td class="td11">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 12>
<td class="td12">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 13>
<td class="td13">${dev.deviceSerialNumber!}</td>
<#elseif dev.oneCount == 14>
<td class="td14">${dev.deviceSerialNumber!}</td>
</#if>
<!--<td>${dev.deviceSerialNumber!}</td>-->
<td>${dev.remark!}</td>
</tr>
</#list>
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/User.java
浏览文件 @ 2a589200
......@@ -14,7 +14,9 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import org.modelmapper.ModelMapper;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
......@@ -31,7 +33,8 @@ import javax.persistence.*;
@Data
@Entity
@ApiModel(value = "用户对象", description = "用户详细信息")
@SQLDelete(sql = "update user set is_del = 1 where id = ?")
@EntityListeners(AuditingEntityListener.class)
@Where(clause = "delete_tag = 0")
public class User {
/**
* 用户
......@@ -41,8 +44,6 @@ public class User {
@GeneratedValue
@Column(columnDefinition = "INT4 AUTO_INCREMENT")
@ApiModelProperty(value = "用户数据ID", name = "userId", example = "12321L")
// @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
// @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
private Integer userId;
/**
......@@ -135,6 +136,12 @@ public class User {
* 培训状态 0.已培训 1.已过期 2.未培训 3.快过期 5.不是专管员
*/
private Integer trainStatus=2;
/**
* 是否删除
*/
private Integer deleteTag = 0;
/**
* 单位对象
*/
......@@ -152,7 +159,7 @@ public class User {
"1234",
"1234",
"123@qq.com",
"123", 0, "360218199801052634", 0, 0, null, 0
"123", 0, "360218199801052634", 0, 0, null, 0,0
, null
);
}
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java
浏览文件 @ 2a589200
......@@ -134,7 +134,9 @@ public class UserServiceImpl implements UserService {
@Override
public boolean delete(Integer id) {
userDao.deleteById(id);
User user= findByUser(id);
user.setDeleteTag(1);
userDao.save(user);
userCache.refresh(userDao.findAll());
return true;
}
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/VenitalisServiceImpl.java
浏览文件 @ 2a589200
......@@ -36,8 +36,8 @@ public class VenitalisServiceImpl implements VenitalisService {
@Autowired
private UserLogDao userLogDao;
private final static String http="http://10.153.4.11:8081";
// private final static String http="http://192.168.0.80:8081";
// private final static String http="http://10.153.4.11:8081";
private final static String http="http://192.168.0.80:8081";
private final static String REGISTERE="/api/v2/auth/register";
private final static String CONTRAST="/api/v2/auth/identify";
@Override
......
pom.xml
浏览文件 @ 2a589200
......@@ -48,6 +48,7 @@
<module>dev-decommissioning</module>
<module>dev-excel</module>
<module>dev-policydocument</module>
<module>dev-questionbank</module>
</modules>
<properties>
......@@ -138,6 +139,12 @@
<artifactId>dev-destroy</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.tykj</groupId>
<artifactId>dev-questionbank</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.tykj</groupId>
<artifactId>dev-confirmcheck</artifactId>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论