Переглянути джерело

流程环节显示办理端

HD_wangm 1 тиждень тому
батько
коміт
5a8750b002

+ 1 - 0
src/main/bpm/com/yw/bpm/client/action/BpmClientFlowListForProcessAction.java

@@ -103,6 +103,7 @@ public class BpmClientFlowListForProcessAction extends RequestAbs {
 					map.put("state", tacheInstance.getState().getValue());
 					map.put("groupName",tacheInstance.getGroupxuserid().getGroupId().getGroupName());
 					map.put("positionName",tacheInstance.getGroupxuserid().getPositionId().getPositionName());
+					map.put("processType",tacheInstance.getProcess_type());
 
 					// 传阅信息
 					List<Task> taskList = taskService.getListOfTasksByTins(tacheInstance.getTinsId(), "8");

+ 1 - 1
src/main/bpm/com/yw/bpm/instance/dao/FlowDaoImpl.java

@@ -68,7 +68,7 @@ public class FlowDaoImpl implements FlowDao {
 			.append("a.d_createdate as flow_d_createdate, a.v_creator, b.name as creator_name, ")
 			.append("(case when a.n_control is not null then a.n_control else d.n_control end) as n_control,")
 			.append("d.v_allow_cancels, t.l_groupxuserid, h.state, ")
-			.append("d.n_is_cancel, d.n_end_cancel, d.n_cancel_can_read, gp.GROUPNAME, p.posname ")
+			.append("d.n_is_cancel, d.n_end_cancel, d.n_cancel_can_read, gp.GROUPNAME, p.posname, t.process_type ")
 			.append("FROM bpm_flow_instance a ")
 			.append("LEFT JOIN t_user b ON b.universalid=a.v_creator ")
 			.append("LEFT JOIN bpm_tache_instance t ON t.l_ins_id=a.l_ins_id ")

+ 1 - 0
src/main/bpm/com/yw/bpm/instance/mapper/TacheInstanceMapper.java

@@ -61,6 +61,7 @@ public class TacheInstanceMapper implements RowMapper {
 		instance.setN_delay(rs.getString("n_delay"));
 		instance.getGroupxuserid().getGroupId().setGroupName(rs.getString("GROUPNAME"));
 		instance.getGroupxuserid().getPositionId().setPositionName(rs.getString("posname"));
+		instance.setProcess_type(rs.getString("process_type"));
 		return instance;
 	}
 }

+ 3 - 0
src/main/webapp/yw/bpm/instance/infoFlow_v_2_1.jsp

@@ -299,6 +299,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/bpm/instance/processFlow_v_2_1.jsp

@@ -496,6 +496,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlowForAll_v_2_1.jsp

@@ -277,6 +277,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlowForDealed_v_2_1.jsp

@@ -277,6 +277,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlowForDealing_v_2_1.jsp

@@ -277,6 +277,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlowForGroup_v_2_1.jsp

@@ -277,6 +277,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlowForMineTask.jsp

@@ -277,6 +277,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlowForMine_v_2_1.jsp

@@ -277,6 +277,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/infoFlow_v_2_1.jsp

@@ -270,6 +270,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>
 

+ 3 - 0
src/main/webapp/yw/master1_bpm/instance/processFlow_v_2_1.jsp

@@ -622,6 +622,9 @@ span[id$="_filespan"] ul{
 								<c:if test="${tache.tache.finishdate != null }">
 									环节办结:<font class="blueFont">${fn:substring(tache.tache.finishdate, 0, 16) }</font>&nbsp;&nbsp;
 								</c:if>
+								<c:if test="${tache.tache.state.value != 1 }">
+								    办理端:<font class="blueFont">${tache.tache.process_type == 1 ? '手机' : '网页'}</font>&nbsp;&nbsp;
+								</c:if>
 								<font style="color: red; font-size: 14px;">${tache.tache.state.dataName }</font>
 							</div>