|
|
@@ -276,11 +276,11 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);margin-top: 11px;\">发起申请</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);margin-top: 11px;\">发起申请</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);\">"+record.getUserName()+"</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(51,51,51,1);\">"+record.getUserName()+"</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; " ; |
|
|
|
|
|
if(i != flowRecordList.size() - 1){ |
|
|
|
|
|
taskListHtml += "border-left: 2px dashed #DEDEDE;"; |
|
|
|
|
|
|
|
|
if(i == flowRecordList.size() - 1){ |
|
|
|
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
|
|
|
}else{ |
|
|
|
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; border-left: 2px dashed #DEDEDE; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
} |
|
|
} |
|
|
taskListHtml += " color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
|
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
} else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) { |
|
|
} else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) { |
|
|
taskListHtml += "<div style=\"overflow: hidden;\">"; |
|
|
taskListHtml += "<div style=\"overflow: hidden;\">"; |
|
|
@@ -289,11 +289,11 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(200,89,98,1);margin-top: 11px;\">待审批</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(200,89,98,1);margin-top: 11px;\">待审批</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(200,89,98,1);\">"+record.getUserName()+"</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(200,89,98,1);\">"+record.getUserName()+"</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; " ; |
|
|
|
|
|
if(i != flowRecordList.size() - 1){ |
|
|
|
|
|
taskListHtml += "border-left: 2px dashed #DEDEDE;"; |
|
|
|
|
|
|
|
|
if(i == flowRecordList.size() - 1){ |
|
|
|
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
|
|
|
}else{ |
|
|
|
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; border-left: 2px dashed #DEDEDE; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
} |
|
|
} |
|
|
taskListHtml += "color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
|
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
} else { |
|
|
} else { |
|
|
taskListHtml += "<div style=\"overflow: hidden;\">"; |
|
|
taskListHtml += "<div style=\"overflow: hidden;\">"; |
|
|
@@ -302,11 +302,12 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-top: 11px;\">同意并呈送</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;line-height: 18px;font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-top: 11px;\">同意并呈送</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);\">"+record.getUserName()+"</div>"; |
|
|
taskListHtml += "<div style=\"float: left; width: auto;margin-right:10px;height: 30px;margin-top:15px;line-height: 14px;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);\">"+record.getUserName()+"</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px;" ; |
|
|
|
|
|
if(i != flowRecordList.size() - 1){ |
|
|
|
|
|
taskListHtml += "border-left: 2px dashed #DEDEDE;"; |
|
|
|
|
|
|
|
|
if(i == flowRecordList.size() - 1){ |
|
|
|
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
|
|
|
}else{ |
|
|
|
|
|
taskListHtml += "<div style=\"width: 80%; overflow: hidden;font-size:14px;font-family:MicrosoftYaHei;font-weight:400;padding-left: 30px;margin-left: 10px;padding-bottom: 20px; line-height: 24px; border-left: 2px dashed #DEDEDE; color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
} |
|
|
} |
|
|
taskListHtml += " color:rgba(153,153,153,1);\">"+record.getRemark() == null ? "" : record.getRemark()+"</div>"; |
|
|
|
|
|
|
|
|
|
|
|
taskListHtml += "</div>"; |
|
|
taskListHtml += "</div>"; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|