Skip to content

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

[任务、政策] 代码修改提交

上级 81bdb706
隐藏空白字符变更
内嵌 并排
正在显示 包含 29 行增加 和 15 行删除
dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/controller/PolicyDocController.java
浏览文件 @ fbdc4ffe
......@@ -52,7 +52,7 @@ public class PolicyDocController {
/**
* 查询政策文件 -分页
* 删除政策文件
*/
@ApiOperation(value = "删除政策文件")
@GetMapping("/delete/{id}")
......
dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/entity/PolicyDocument.java
浏览文件 @ fbdc4ffe
......@@ -31,6 +31,7 @@ public class PolicyDocument extends BaseEntity {
private String name;
@Column(name = "file_string" ,columnDefinition = "TEXT")
private String fileString;
......@@ -41,4 +42,7 @@ public class PolicyDocument extends BaseEntity {
* 1 政策文件 2 软件
*/
private Integer type;
@Transient
private String createUserName;
}
dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/service/impl/PolicyDocumentServiceImpl.java
浏览文件 @ fbdc4ffe
......@@ -8,6 +8,7 @@ import com.tykj.dev.device.policydocument.dao.PolicyDocumentDao;
import com.tykj.dev.device.policydocument.entity.PolicyDocVo;
import com.tykj.dev.device.policydocument.entity.PolicyDocument;
import com.tykj.dev.device.policydocument.service.PolicyDocumentService;
import com.tykj.dev.device.user.cache.UserCache;
import com.tykj.dev.device.user.subject.entity.Units;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
......@@ -31,6 +32,9 @@ public class PolicyDocumentServiceImpl implements PolicyDocumentService {
@Autowired
PolicyDocumentDao policyDocumentDao;
@Autowired
UserCache userCache;
@Override
public PolicyDocument save(PolicyDocument policyDocument) {
policyDocument.setFileString(FilesUtil.stringFileToList(policyDocument.getFileRetList()));
......@@ -42,6 +46,7 @@ public class PolicyDocumentServiceImpl implements PolicyDocumentService {
return policyDocumentDao.findAll(getPredicateBuilder(policyDocVo),policyDocVo.getPageable()).map(
policyDocument -> {
policyDocument.setFileRetList(FilesUtil.stringFileToList(policyDocument.getFileString()));
policyDocument.setCreateUserName(userCache.findById(policyDocument.getCreateUserId()).getName());
return policyDocument;
}
);
......
dev-task/src/main/java/com/tykj/dev/device/task/service/TaskService.java
浏览文件 @ fbdc4ffe
......@@ -178,6 +178,9 @@ public interface TaskService {
*/
Optional<Task> findBillIdAndBusinessType(Integer billId, Integer businessType,Integer billStatus);
/**
* 根据业务id 以及 业务类型进行查询
*/
......@@ -204,4 +207,6 @@ public interface TaskService {
* 根据上级id以及billType 查询task
*/
TaskBto findBillTypeAndFatherId(Integer billType,Integer fatherId);
}
dev-union/src/main/resources/bill.html
浏览文件 @ fbdc4ffe
......@@ -349,17 +349,17 @@
<div class="title">
<div class="main-title">
<span>
${title}
${title!}
</span>
</div>
<div style="width:100%;font-size: 1px;">
<div style="display:inline-block;text-align:left; width: 33%; font-size: 10px;"
class="number">
<span>${number}</span>
<span>${number!}</span>
</div>
<div style="display:inline-block;text-align:center; width: 33%; font-size: 10px;"
class="number">
<span>(${ul})</span>
<span>(${ul}!)</span>
</div>
<div style="display:inline-block;text-align:right; width: 33%; font-size: 10px;"
class="number">
......@@ -371,11 +371,11 @@
<div class="line1">
<span class="sendTo">
<span style="text-indent: 5px; display: inline-block;">发往:</span>
<span>${receiveUnit}</span>
<span>${receiveUnit!}</span>
</span>
<span class="sendNum">
<span style="text-indent: 5px; display: inline-block;">批复文号:</span>
<span>${replyNum}</span>
<span>${replyNum!}</span>
</span>
</div>
<div class="line2 tableList">
......@@ -410,7 +410,7 @@
<span class="left">
<span style="padding:6px 0 12px ;">
<span class="label">发件单位:</span>
<span class="value">${senderUnit}</span>
<span class="value">${senderUnit!}</span>
</span>
<span style="padding-bottom:12px ;">
<span class="label"><span style="letter-spacing: 7px;">签发</span>人:</span>
......@@ -450,7 +450,7 @@
</span>
</div>
<div style="position: relative;left: 250px;top: 38px;">
<i style="bottom: 30px;right: 40px;">
<i style="bottom: 30px;right: 90px;">
<span style="color: #000">
<span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span
......
dev-union/src/main/resources/bill1.html
浏览文件 @ fbdc4ffe
......@@ -341,15 +341,15 @@
<div class="title">
<div class="main-title">
<span>
${title}
${title!}
</span>
</div>
<div style="width:100%;text-align:left;font-size: 1px;margin-bottom: 2px;">
<div style="text-align:left;display: inline-block; width: 33%" class="number">
<span class="number">${number}</span>
<span class="number">${number!}</span>
</div>
<div style="text-align:center;display: inline-block; width: 33%" class="number">
<span>(${ul})</span>
<span>(${ul!})</span>
</div>
<div style="text-align:right;display: inline-block; width: 33%" class="number">
<span>机密</span>
......@@ -360,11 +360,11 @@
<div class="line1">
<span class="sendTo">
<span>销毁单位:</span>
<span>${unitName}</span>
<span>${unitName!}</span>
</span>
<span class="sendNum">
<span>销毁时间:</span>
<span>${time}</span>
<span>${time!}</span>
</span>
</div>
<div class="line2 tableList">
......
dev-union/src/main/resources/bill2.html
浏览文件 @ fbdc4ffe
......@@ -177,7 +177,7 @@
<p class="title" style="margin-bottom:20px">
<div class="main-title">
<span>
${title}
${title!}
</span>
</div>
</p>
......
dev-union/src/main/resources/bill3.html
浏览文件 @ fbdc4ffe
......@@ -313,7 +313,7 @@
</div>
<div style="width:100%;text-align:left;font-size: 1px;margin-bottom:2px">
<div style="text-align:left;display: inline-block; width: 49%" class="number">
<span class="number">时间：${time}</span>
<span class="number">时间：${time!}</span>
</div>
<!-- <div style="text-align:center;display: inline-block; width: 34%" class="number">
<span></span>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论