pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改出库审批流程图（添加用户头像）

lwx_dev
erdanergou 2 years ago
parent
cf2763f45f
commit
5b08a6209a
7 changed files with 224 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 8
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 5
      src/main/java/com/dreamchaser/depository_manage/entity/UserByPort.java
  4. 27
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
  5. 94
      src/main/resources/templates/pages/application/form-step-look_back.html
  6. 20
      src/test/java/com/dreamchaser/depository_manage/SomeTest.java
  7. 94
      target/classes/templates/pages/application/form-step-look_back.html

23
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -1471,25 +1471,35 @@ public class DepositoryRecordController {
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Map<String,String> completeUserIconMap = new HashMap<>();
for (UserByPort userByPort : managerList) { for (UserByPort userByPort : managerList) {
sb.append(userByPort.getName()).append(","); String name = userByPort.getName();
sb.append(name).append(",");
completeUserIconMap.put(name,userByPort.getIconphoto());
} }
recordPById.setCompleteOutUserName(sb.toString()); recordPById.setCompleteOutUserName(sb.toString());
recordPById.setCompleteOutUserIconPhoto(completeUserIconMap);
recordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getApplicantTime()))); recordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getApplicantTime())));
recordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepartmentheadTime()))); recordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepartmentheadTime())));
recordPById.setDepositoryManagerTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepositoryManagerTime()))); recordPById.setDepositoryManagerTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepositoryManagerTime())));
// 获取平衡岗人员 // 获取平衡岗人员
String balancePoster = recordPById.getBalancePoster(); String balancePoster = recordPById.getBalancePoster();
Map<String,String> balancePosterIconPhoto = new HashMap<>();
StringBuilder balancePosterName = new StringBuilder(); StringBuilder balancePosterName = new StringBuilder();
if (balancePoster != null) { if (balancePoster != null) {
String[] split = balancePoster.split(","); String[] split = balancePoster.split(",");
for (String s : split) { for (String s : split) {
if (!"".equals(s)) { if (!"".equals(s)) {
UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token);
balancePosterName.append(userByPort.getName()).append(","); String name = userByPort.getName();
balancePosterIconPhoto.put(name,userByPort.getIconphoto());
balancePosterName.append(name).append(",");
} }
} }
recordPById.setBalancePosterName(balancePosterName.toString());
recordPById.setBalancePosterUserIconPhoto(balancePosterIconPhoto);
recordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getBalancePosterTime()))); recordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getBalancePosterTime())));
} else { } else {
recordPById.setBalancePosterTime(""); recordPById.setBalancePosterTime("");
@ -1505,17 +1515,22 @@ public class DepositoryRecordController {
depositoryManagerId = manager.split(","); depositoryManagerId = manager.split(",");
} }
StringBuilder depositoryManagerNames = new StringBuilder(); StringBuilder depositoryManagerNames = new StringBuilder();
Map<String,String> depositoryManagerIconPhoto = new HashMap<>();
for (String s : depositoryManagerId) { for (String s : depositoryManagerId) {
if ("".equals(s)) { if ("".equals(s)) {
continue; continue;
} }
Integer managerid = ObjectFormatUtil.toInteger(s); Integer managerid = ObjectFormatUtil.toInteger(s);
UserByPort user = PublicConfig.FindUserById(managerid, userKey, token); UserByPort user = PublicConfig.FindUserById(managerid, userKey, token);
depositoryManagerNames.append(user.getName()); String name = user.getName();
depositoryManagerIconPhoto.put(name,user.getIconphoto());
depositoryManagerNames.append(name);
} }
recordPById.setDepositoryManagerUserIconPhoto(depositoryManagerIconPhoto);
recordPById.setDepositoryManagerName(depositoryManagerNames.toString()); recordPById.setDepositoryManagerName(depositoryManagerNames.toString());
} }
recordPById.setBalancePosterName(balancePosterName.toString());
} }
return new RestResponse(recordPById); return new RestResponse(recordPById);
} else { } else {

8
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -2506,6 +2506,7 @@ public class PageController {
Integer applicantId = applicationOutRecordPById.getApplicantId(); Integer applicantId = applicationOutRecordPById.getApplicantId();
// 获取申请人信息 // 获取申请人信息
UserByPort userByPort = PublicConfig.FindUserById(applicantId, userKey, token); UserByPort userByPort = PublicConfig.FindUserById(applicantId, userKey, token);
// 部门负责人 // 部门负责人
String departmentHead = applicationOutRecordPById.getDepartmenthead(); String departmentHead = applicationOutRecordPById.getDepartmenthead();
String[] split = departmentHead.split(","); String[] split = departmentHead.split(",");
@ -2514,13 +2515,16 @@ public class PageController {
split = new String[0]; split = new String[0];
} }
StringBuilder departmentHeadName = new StringBuilder(); StringBuilder departmentHeadName = new StringBuilder();
Map<String,String> departmentHeadUserIcon = new HashMap<>();
String useAdminorgName = ""; String useAdminorgName = "";
for (String value : split) { for (String value : split) {
if ("".equals(value)) { if ("".equals(value)) {
continue; continue;
} }
UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token);
departmentHeadName.append(departmenthead.getName()).append(","); String name = departmenthead.getName();
departmentHeadUserIcon.put(name,departmenthead.getIconphoto());
departmentHeadName.append(name).append(",");
useAdminorgName = departmenthead.getMaindeparmentname(); useAdminorgName = departmenthead.getMaindeparmentname();
} }
// 仓储中心负责人 // 仓储中心负责人
@ -2568,7 +2572,9 @@ public class PageController {
} }
applicationOutRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); applicationOutRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
applicationOutRecordPById.setApplicantUserIconPhoto(userByPort.getIconphoto());
applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString()); applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString());
applicationOutRecordPById.setDepartmentheadUserIconPhoto(departmentHeadUserIcon);
applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString()); applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString());
applicationOutRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getApplicantTime()))); applicationOutRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getApplicantTime())));
applicationOutRecordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getDepartmentheadTime()))); applicationOutRecordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getDepartmentheadTime())));

5
src/main/java/com/dreamchaser/depository_manage/entity/UserByPort.java
View File

@ -30,6 +30,11 @@ public class UserByPort {
*/ */
private String icon; private String icon;
/**
* 头像图片
*/
private String iconphoto;
/** /**
* 雇佣类型（1：雇佣入职；2：再入职；） * 雇佣类型（1：雇佣入职；2：再入职；）
*/ */

27
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
View File

@ -6,6 +6,7 @@ import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.util.Map;
@Data @Data
public class ApplicationOutRecordP { public class ApplicationOutRecordP {
@ -49,6 +50,11 @@ public class ApplicationOutRecordP {
*/ */
private String applicantName; private String applicantName;
/**
* 申请人用户头像
*/
private String applicantUserIconPhoto;
/** /**
* 申请时间 * 申请时间
*/ */
@ -85,6 +91,11 @@ public class ApplicationOutRecordP {
*/ */
private String departmentheadName; private String departmentheadName;
/**
* 部门负责人用户头像
*/
private Map<String,String> departmentheadUserIconPhoto;
/** /**
* 部门负责人意见（1通过2退回） * 部门负责人意见（1通过2退回）
*/ */
@ -104,6 +115,11 @@ public class ApplicationOutRecordP {
* 仓库管理员 * 仓库管理员
*/ */
private String depositoryManager; private String depositoryManager;
/**
* 仓库管理员用户头像
*/
private Map<String,String> depositoryManagerUserIconPhoto;
/** /**
* 仓库管理员名称 * 仓库管理员名称
*/ */
@ -128,6 +144,12 @@ public class ApplicationOutRecordP {
* 平衡岗人员 * 平衡岗人员
*/ */
private String balancePoster; private String balancePoster;
/**
* 平衡岗人员用户头像
*/
private Map<String,String> balancePosterUserIconPhoto;
/** /**
* 平衡岗人员名称 * 平衡岗人员名称
*/ */
@ -229,6 +251,11 @@ public class ApplicationOutRecordP {
*/ */
private String completeOutUserName; private String completeOutUserName;
/**
* 要出库的人员用户头像
*/
private Map<String,String> completeOutUserIconPhoto;
/** /**
* 出库类别名称 * 出库类别名称
*/ */

94
src/main/resources/templates/pages/application/form-step-look_back.html
View File

@ -168,8 +168,12 @@
<div class="layui-timeline-item" id="applicantNode"> <div class="layui-timeline-item" id="applicantNode">
<i class="layui-icon layui-timeline-axis layui-icon-friends"></i> <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
<div class="layui-timeline-content layui-text"> <div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title" <h3 class="layui-timeline-title">申请人:</h3>
th:text="'申请人：'+ ${record.getApplicantName()}"></h3> <p>
<img th:src="${record.getApplicantUserIconPhoto()}"
style="vertical-align:middle;height: 50px">
<span th:text="${record.getApplicantName()}"></span>
</p>
<p th:text="'申请时间：'+${record.getApplicantTime()}"></p> <p th:text="'申请时间：'+${record.getApplicantTime()}"></p>
<p th:text="'申请事由：'+${record.getApplyRemark()}"></p> <p th:text="'申请事由：'+${record.getApplyRemark()}"></p>
</div> </div>
@ -178,8 +182,11 @@
<i id="firstApprovalNodeIcon" <i id="firstApprovalNodeIcon"
class="layui-icon layui-timeline-axis layui-icon-friends"></i> class="layui-icon layui-timeline-axis layui-icon-friends"></i>
<div class="layui-timeline-content layui-text"> <div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title" <h3 class="layui-timeline-title">审批人:</h3>
th:text="'审批人：'+ ${record.getDepartmentheadName()}"></h3> <p th:each="d,iterStar:${record.getDepartmentheadUserIconPhoto()}">
<img th:src="${d.getValue()}" style="vertical-align:middle;height: 50px">
<span th:text="${d.getKey()}"></span>
</p>
<p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p> <p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p>
</div> </div>
</div> </div>
@ -286,14 +293,37 @@
// 如果需要平衡岗且第一个节点审批完成 // 如果需要平衡岗且第一个节点审批完成
if (balancePosterPass === "3") { if (balancePosterPass === "3") {
// 如果平衡岗未审批 // 如果平衡岗未审批
let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>'; let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let balancePosterIconPhoto = record.balancePosterUserIconPhoto;
let approvalNodeForBalancerIconPhoto = '';
for (let key in balancePosterIconPhoto) {
if (balancePosterIconPhoto.hasOwnProperty(key)) {
let balancePosterIconPhotoItem = '<p>' +
'<img alt="头像" src="' + balancePosterIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeForBalancerIconPhoto += balancePosterIconPhotoItem;
}
}
let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem; let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + approvalNodeForBalancerIconPhoto + timeLineEndItem;
// 添加节点 // 添加节点
firstApprovalNode.after(approvalNodeForBalancer); firstApprovalNode.after(approvalNodeForBalancer);
flagForBalancerNode = -1; // 不展示 flagForBalancerNode = -1; // 不展示
} else { } else {
let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>'; let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let balancePosterIconPhoto = record.balancePosterUserIconPhoto;
let approvalNodeForBalancerIconPhoto = '';
for (let key in balancePosterIconPhoto) {
if (balancePosterIconPhoto.hasOwnProperty(key)) {
let balancePosterIconPhotoItem = '<p>' +
'<img alt="头像" src="' + balancePosterIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeForBalancerIconPhoto += balancePosterIconPhotoItem;
}
}
let approvalNodeForBalancerTime = '<p>审批时间：' + balancePosterNameTime + '</p>'; let approvalNodeForBalancerTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
let approvalNodeForBalancerMessage = '<p>审批意见：' + balancePosterMessage + '</p>'; let approvalNodeForBalancerMessage = '<p>审批意见：' + balancePosterMessage + '</p>';
let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
@ -310,7 +340,7 @@
flagForBalancerNode = -1; // 不展示 flagForBalancerNode = -1; // 不展示
timeLineStartItemForState = '<p>审批状态：审批未通过</p>'; timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
} }
let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem; let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerIconPhoto + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem;
firstApprovalNode.after(approvalNodeForBalancer); firstApprovalNode.after(approvalNodeForBalancer);
} }
@ -330,9 +360,19 @@
// 如果可以查看该节点 // 如果可以查看该节点
if (depositoryManagerPass === "3") { if (depositoryManagerPass === "3") {
// 如果平衡岗未审批 // 如果平衡岗未审批
let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>'; let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let depositoryManagerIconPhoto = record.depositoryManagerUserIconPhoto;
let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem; let approvalNodeFordepositoryManagerIconPhoto = '';
for (let key in depositoryManagerIconPhoto) {
if (depositoryManagerIconPhoto.hasOwnProperty(key)) {
let depositoryManagerIconPhotoItem = '<p>' +
'<img alt="头像" src="' + depositoryManagerIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeFordepositoryManagerIconPhoto += depositoryManagerIconPhotoItem;
}
}
let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName+approvalNodeFordepositoryManagerIconPhoto + timeLineEndItem;
// 添加节点 // 添加节点
if (flagForBalancerNode === 2) { if (flagForBalancerNode === 2) {
// 如果是第二个节点 // 如果是第二个节点
@ -342,11 +382,22 @@
$("#secondApprovalNode").after(approvalNodeForBalancer); $("#secondApprovalNode").after(approvalNodeForBalancer);
} }
} else { } else {
let approvalNodeForDepositoryManagerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>'; let approvalNodeForDepositoryManagerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let approvalNodeForDepositoryManagerTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>'; let approvalNodeForDepositoryManagerTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
let approvalNodeForDepositoryManagerMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>'; let approvalNodeForDepositoryManagerMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
let timeLineStartItemForIcon; let timeLineStartItemForIcon;
let timeLineStartItemForState; let timeLineStartItemForState;
let depositoryManagerIconPhoto = record.depositoryManagerUserIconPhoto;
let approvalNodeFordepositoryManagerIconPhoto = '';
for (let key in depositoryManagerIconPhoto) {
if (depositoryManagerIconPhoto.hasOwnProperty(key)) {
let depositoryManagerIconPhotoItem = '<p>' +
'<img alt="头像" src="' + depositoryManagerIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeFordepositoryManagerIconPhoto += depositoryManagerIconPhotoItem;
}
}
if (depositoryManagerPass === "1") { if (depositoryManagerPass === "1") {
// 如果审批通过 // 如果审批通过
timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok"); timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok");
@ -356,7 +407,7 @@
timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close"); timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close");
timeLineStartItemForState = '<p>审批状态：审批未通过</p>'; timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
} }
let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem; let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName +approvalNodeFordepositoryManagerIconPhoto + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem;
if (flagForBalancerNode === 2) { if (flagForBalancerNode === 2) {
// 如果是第二个节点 // 如果是第二个节点
firstApprovalNode.after(approvalNodeForBalancer); firstApprovalNode.after(approvalNodeForBalancer);
@ -372,14 +423,25 @@
let completeOutUserName = record.completeOutUserName; let completeOutUserName = record.completeOutUserName;
let completeOutTime = record.outTime; let completeOutTime = record.outTime;
let pass = record.pass; let pass = record.pass;
let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库处理人：' + completeOutUserName + '</h3>'; let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库处理人：</h3>';
let approvalCompleteOutNode; let approvalCompleteOutNode;
let completeOutUserIconPhoto = record.completeOutUserIconPhoto;
let approvalNodeForCompleteOutUserIconPhoto = '';
for (let key in completeOutUserIconPhoto) {
if (completeOutUserIconPhoto.hasOwnProperty(key)) {
let depositoryManagerIconPhotoItem = '<p>' +
'<img alt="头像" src="' + completeOutUserIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeForCompleteOutUserIconPhoto += depositoryManagerIconPhotoItem;
}
}
if (pass === 1) { if (pass === 1) {
let approvalNodeForCompleteOutState = '<p>处理状态：出库完成</p>'; let approvalNodeForCompleteOutState = '<p>处理状态：出库完成</p>';
let approvalNodeForCompleteOutTime = '<p>出库时间：' + completeOutTime + '</p>'; let approvalNodeForCompleteOutTime = '<p>出库时间：' + completeOutTime + '</p>';
approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem; approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName+approvalNodeForCompleteOutUserIconPhoto + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem;
} else { } else {
approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName + timeLineEndItem; approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName+approvalNodeForCompleteOutUserIconPhoto + timeLineEndItem;
} }
if (flagForBalancerNode === 2) { if (flagForBalancerNode === 2) {
if (depositoryManagerPass !== "4") { if (depositoryManagerPass !== "4") {

20
src/test/java/com/dreamchaser/depository_manage/SomeTest.java
View File

@ -252,7 +252,7 @@ public class SomeTest {
ApprovalInfo approvalInfo = new ApprovalInfo(); ApprovalInfo approvalInfo = new ApprovalInfo();
approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
approvalInfo.setSpNo("202307040036"); approvalInfo.setSpNo("202307050007");
// 模拟第一个节点（部门负责人） // 模拟第一个节点（部门负责人）
@ -262,7 +262,7 @@ public class SomeTest {
List<ApprovalInfo_Details> approvalInfo_Details1 = new ArrayList<>(); List<ApprovalInfo_Details> approvalInfo_Details1 = new ArrayList<>();
ApprovalInfo_Details ad1 = new ApprovalInfo_Details(); ApprovalInfo_Details ad1 = new ApprovalInfo_Details();
ad1.setSpStatus("2"); ad1.setSpStatus("2");
ad1.setSpTime("1687653908000"); ad1.setSpTime("1688520723000");
ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver();
approver1.setUserId("PangFuZhen"); approver1.setUserId("PangFuZhen");
ad1.setApprover(approver1); ad1.setApprover(approver1);
@ -271,11 +271,11 @@ public class SomeTest {
// 模拟第二个节点(宋倩倩，平衡岗) // 模拟第二个节点(宋倩倩，平衡岗)
ApprovalInfo_SpRecord asr2 = new ApprovalInfo_SpRecord(); ApprovalInfo_SpRecord asr2 = new ApprovalInfo_SpRecord();
asr2.setSpStatus("2"); asr2.setSpStatus("1");
List<ApprovalInfo_Details> approvalInfo_Details2 = new ArrayList<>(); List<ApprovalInfo_Details> approvalInfo_Details2 = new ArrayList<>();
ApprovalInfo_Details ad2 = new ApprovalInfo_Details(); ApprovalInfo_Details ad2 = new ApprovalInfo_Details();
ad2.setSpStatus("2"); ad2.setSpStatus("1");
ad2.setSpTime("1688459631000"); ad2.setSpTime("0");
ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver();
approver2.setUserId("YangYangBaoBei"); approver2.setUserId("YangYangBaoBei");
ad2.setApprover(approver2); ad2.setApprover(approver2);
@ -284,11 +284,11 @@ public class SomeTest {
// 模拟第三个节点(综合办负责人)(仓储负责人) // 模拟第三个节点(综合办负责人)(仓储负责人)
ApprovalInfo_SpRecord asr3 = new ApprovalInfo_SpRecord(); ApprovalInfo_SpRecord asr3 = new ApprovalInfo_SpRecord();
asr3.setSpStatus("2"); asr3.setSpStatus("1");
List<ApprovalInfo_Details> approvalInfo_Details3 = new ArrayList<>(); List<ApprovalInfo_Details> approvalInfo_Details3 = new ArrayList<>();
ApprovalInfo_Details ad3 = new ApprovalInfo_Details(); ApprovalInfo_Details ad3 = new ApprovalInfo_Details();
ad3.setSpStatus("2"); ad3.setSpStatus("1");
ad3.setSpTime("1688459731000"); ad3.setSpTime("0");
ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver();
approver3.setUserId("SiKai"); approver3.setUserId("SiKai");
ad3.setApprover(approver3); ad3.setApprover(approver3);
@ -310,8 +310,8 @@ public class SomeTest {
spRecord_list.add(asr1); spRecord_list.add(asr1);
spRecord_list.add(asr2); // spRecord_list.add(asr2);
spRecord_list.add(asr3); // spRecord_list.add(asr3);
spRecord_list.add(asr4); spRecord_list.add(asr4);
approvalInfo.setSpRecord(spRecord_list); approvalInfo.setSpRecord(spRecord_list);

94
target/classes/templates/pages/application/form-step-look_back.html
View File

@ -168,8 +168,12 @@
<div class="layui-timeline-item" id="applicantNode"> <div class="layui-timeline-item" id="applicantNode">
<i class="layui-icon layui-timeline-axis layui-icon-friends"></i> <i class="layui-icon layui-timeline-axis layui-icon-friends"></i>
<div class="layui-timeline-content layui-text"> <div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title" <h3 class="layui-timeline-title">申请人:</h3>
th:text="'申请人：'+ ${record.getApplicantName()}"></h3> <p>
<img th:src="${record.getApplicantUserIconPhoto()}"
style="vertical-align:middle;height: 50px">
<span th:text="${record.getApplicantName()}"></span>
</p>
<p th:text="'申请时间：'+${record.getApplicantTime()}"></p> <p th:text="'申请时间：'+${record.getApplicantTime()}"></p>
<p th:text="'申请事由：'+${record.getApplyRemark()}"></p> <p th:text="'申请事由：'+${record.getApplyRemark()}"></p>
</div> </div>
@ -178,8 +182,11 @@
<i id="firstApprovalNodeIcon" <i id="firstApprovalNodeIcon"
class="layui-icon layui-timeline-axis layui-icon-friends"></i> class="layui-icon layui-timeline-axis layui-icon-friends"></i>
<div class="layui-timeline-content layui-text"> <div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title" <h3 class="layui-timeline-title">审批人:</h3>
th:text="'审批人：'+ ${record.getDepartmentheadName()}"></h3> <p th:each="d,iterStar:${record.getDepartmentheadUserIconPhoto()}">
<img th:src="${d.getValue()}" style="vertical-align:middle;height: 50px">
<span th:text="${d.getKey()}"></span>
</p>
<p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p> <p id="firstApprovalNodeState" th:text="'审批状态：待审批'"></p>
</div> </div>
</div> </div>
@ -286,14 +293,37 @@
// 如果需要平衡岗且第一个节点审批完成 // 如果需要平衡岗且第一个节点审批完成
if (balancePosterPass === "3") { if (balancePosterPass === "3") {
// 如果平衡岗未审批 // 如果平衡岗未审批
let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>'; let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let balancePosterIconPhoto = record.balancePosterUserIconPhoto;
let approvalNodeForBalancerIconPhoto = '';
for (let key in balancePosterIconPhoto) {
if (balancePosterIconPhoto.hasOwnProperty(key)) {
let balancePosterIconPhotoItem = '<p>' +
'<img alt="头像" src="' + balancePosterIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeForBalancerIconPhoto += balancePosterIconPhotoItem;
}
}
let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem; let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + approvalNodeForBalancerIconPhoto + timeLineEndItem;
// 添加节点 // 添加节点
firstApprovalNode.after(approvalNodeForBalancer); firstApprovalNode.after(approvalNodeForBalancer);
flagForBalancerNode = -1; // 不展示 flagForBalancerNode = -1; // 不展示
} else { } else {
let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + balancePosterName + '</h3>'; let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let balancePosterIconPhoto = record.balancePosterUserIconPhoto;
let approvalNodeForBalancerIconPhoto = '';
for (let key in balancePosterIconPhoto) {
if (balancePosterIconPhoto.hasOwnProperty(key)) {
let balancePosterIconPhotoItem = '<p>' +
'<img alt="头像" src="' + balancePosterIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeForBalancerIconPhoto += balancePosterIconPhotoItem;
}
}
let approvalNodeForBalancerTime = '<p>审批时间：' + balancePosterNameTime + '</p>'; let approvalNodeForBalancerTime = '<p>审批时间：' + balancePosterNameTime + '</p>';
let approvalNodeForBalancerMessage = '<p>审批意见：' + balancePosterMessage + '</p>'; let approvalNodeForBalancerMessage = '<p>审批意见：' + balancePosterMessage + '</p>';
let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode");
@ -310,7 +340,7 @@
flagForBalancerNode = -1; // 不展示 flagForBalancerNode = -1; // 不展示
timeLineStartItemForState = '<p>审批状态：审批未通过</p>'; timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
} }
let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem; let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerIconPhoto + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem;
firstApprovalNode.after(approvalNodeForBalancer); firstApprovalNode.after(approvalNodeForBalancer);
} }
@ -330,9 +360,19 @@
// 如果可以查看该节点 // 如果可以查看该节点
if (depositoryManagerPass === "3") { if (depositoryManagerPass === "3") {
// 如果平衡岗未审批 // 如果平衡岗未审批
let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>'; let approvalNodeForBalancerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let depositoryManagerIconPhoto = record.depositoryManagerUserIconPhoto;
let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName + timeLineEndItem; let approvalNodeFordepositoryManagerIconPhoto = '';
for (let key in depositoryManagerIconPhoto) {
if (depositoryManagerIconPhoto.hasOwnProperty(key)) {
let depositoryManagerIconPhotoItem = '<p>' +
'<img alt="头像" src="' + depositoryManagerIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeFordepositoryManagerIconPhoto += depositoryManagerIconPhotoItem;
}
}
let approvalNodeForBalancer = timeLineStartItemForId + approvalNodeForBalancerName+approvalNodeFordepositoryManagerIconPhoto + timeLineEndItem;
// 添加节点 // 添加节点
if (flagForBalancerNode === 2) { if (flagForBalancerNode === 2) {
// 如果是第二个节点 // 如果是第二个节点
@ -342,11 +382,22 @@
$("#secondApprovalNode").after(approvalNodeForBalancer); $("#secondApprovalNode").after(approvalNodeForBalancer);
} }
} else { } else {
let approvalNodeForDepositoryManagerName = '<h3 class="layui-timeline-title">审批人：' + depositoryManager + '</h3>'; let approvalNodeForDepositoryManagerName = '<h3 class="layui-timeline-title">审批人：</h3>';
let approvalNodeForDepositoryManagerTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>'; let approvalNodeForDepositoryManagerTime = '<p>审批时间：' + depositoryManagerNameTime + '</p>';
let approvalNodeForDepositoryManagerMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>'; let approvalNodeForDepositoryManagerMessage = '<p>审批意见：' + depositoryManagerMessage + '</p>';
let timeLineStartItemForIcon; let timeLineStartItemForIcon;
let timeLineStartItemForState; let timeLineStartItemForState;
let depositoryManagerIconPhoto = record.depositoryManagerUserIconPhoto;
let approvalNodeFordepositoryManagerIconPhoto = '';
for (let key in depositoryManagerIconPhoto) {
if (depositoryManagerIconPhoto.hasOwnProperty(key)) {
let depositoryManagerIconPhotoItem = '<p>' +
'<img alt="头像" src="' + depositoryManagerIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeFordepositoryManagerIconPhoto += depositoryManagerIconPhotoItem;
}
}
if (depositoryManagerPass === "1") { if (depositoryManagerPass === "1") {
// 如果审批通过 // 如果审批通过
timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok"); timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok");
@ -356,7 +407,7 @@
timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close"); timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close");
timeLineStartItemForState = '<p>审批状态：审批未通过</p>'; timeLineStartItemForState = '<p>审批状态：审批未通过</p>';
} }
let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem; let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName +approvalNodeFordepositoryManagerIconPhoto + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem;
if (flagForBalancerNode === 2) { if (flagForBalancerNode === 2) {
// 如果是第二个节点 // 如果是第二个节点
firstApprovalNode.after(approvalNodeForBalancer); firstApprovalNode.after(approvalNodeForBalancer);
@ -372,14 +423,25 @@
let completeOutUserName = record.completeOutUserName; let completeOutUserName = record.completeOutUserName;
let completeOutTime = record.outTime; let completeOutTime = record.outTime;
let pass = record.pass; let pass = record.pass;
let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库处理人：' + completeOutUserName + '</h3>'; let approvalNodeForCompleteOutUserName = '<h3 class="layui-timeline-title">出库处理人：</h3>';
let approvalCompleteOutNode; let approvalCompleteOutNode;
let completeOutUserIconPhoto = record.completeOutUserIconPhoto;
let approvalNodeForCompleteOutUserIconPhoto = '';
for (let key in completeOutUserIconPhoto) {
if (completeOutUserIconPhoto.hasOwnProperty(key)) {
let depositoryManagerIconPhotoItem = '<p>' +
'<img alt="头像" src="' + completeOutUserIconPhoto[key] + '" style="vertical-align: middle;height: 50px;">' +
'<span>' + key + '</span>' +
'</p>';
approvalNodeForCompleteOutUserIconPhoto += depositoryManagerIconPhotoItem;
}
}
if (pass === 1) { if (pass === 1) {
let approvalNodeForCompleteOutState = '<p>处理状态：出库完成</p>'; let approvalNodeForCompleteOutState = '<p>处理状态：出库完成</p>';
let approvalNodeForCompleteOutTime = '<p>出库时间：' + completeOutTime + '</p>'; let approvalNodeForCompleteOutTime = '<p>出库时间：' + completeOutTime + '</p>';
approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem; approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName+approvalNodeForCompleteOutUserIconPhoto + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem;
} else { } else {
approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName + timeLineEndItem; approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName+approvalNodeForCompleteOutUserIconPhoto + timeLineEndItem;
} }
if (flagForBalancerNode === 2) { if (flagForBalancerNode === 2) {
if (depositoryManagerPass !== "4") { if (depositoryManagerPass !== "4") {

Write Preview
Loading…
Cancel
Save