【首页流程处理支持备注字段】

WebContent/app/view/common/DeskTop/FlowPortal.js

@@ -165,7 +165,7 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
 		});
 	},
 	_alreadyDo:function(){
-		var me=this,fields=['JP_NAME','JP_STATUS','JP_NODEID','JP_CODEVALUE','JN_NAME','JN_DEALRESULT','JN_DEALTIME','JN_NODEDESCRIPTION'];    
+		var me=this,fields=['JP_NAME','JP_STATUS','JP_NODEID','JP_CODEVALUE','JN_NAME','JN_DEALRESULT','JN_DEALTIME','JN_NODEDESCRIPTION','JP_PROCESSNOTE'];
 		return Ext.widget('gridpanel',{
 			title:arguments[1],
 			layout:'fit',
@@ -181,11 +181,17 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
 						description='';
 					}
 					else description='</br><font color="#777">'+description+'</font>';
-					return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0}&nbsp;{1}</a>{2}',
+                    var note=record.get('JP_PROCESSNOTE');
+                    if(note==null || note =='' || note=='null') {
+                        note='';
+                    }
+                    else note='</br><font color="#777">'+note+'</font>';
+					return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0}&nbsp;{1}</a>{2}{4}',
 							record.get('JP_NAME'),
 							record.get('JP_CODEVALUE'),
 							description,
-							record.get('JP_NODEID')
+							record.get('JP_NODEID'),
+							note
 					);
 				}
 			},{
@@ -202,7 +208,7 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
 		});
 	},
 	_alreadyLaunch:function(){
-		var me=this,fields=['JP_STATUS','JP_NODEID','JP_NAME','JP_NODENAME','JP_NODEDEALMANNAME','JP_LAUNCHTIME','JP_LAUNCHERNAME','JP_CODEVALUE'];    
+		var me=this,fields=['JP_STATUS','JP_NODEID','JP_NAME','JP_NODENAME','JP_NODEDEALMANNAME','JP_LAUNCHTIME','JP_LAUNCHERNAME','JP_CODEVALUE','JP_PROCESSNOTE'];
 		return Ext.widget('gridpanel',{
 			title:arguments[1],
 			columns:[{
@@ -217,11 +223,17 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
 						description='';
 					}
 					else description='</br><font color="#777">'+description+'</font>';
-					return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0}&nbsp;{1}</a>{2}',
+                    var note=record.get('JP_PROCESSNOTE');
+                    if(note==null || note =='' || note=='null') {
+                        note='';
+                    }
+                    else note='</br><font color="#777">'+note+'</font>';
+					return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0}&nbsp;{1}</a>{2}{4}',
 							record.get('JP_NAME'),
 							record.get('JP_CODEVALUE'),
 							description,
-							record.get('JP_NODEID')
+							record.get('JP_NODEID'),
+                        	note
 					);
 				}
 			},{

src/com/uas/erp/service/common/impl/DeskTopServiceImpl.java

@@ -59,7 +59,7 @@ public class DeskTopServiceImpl implements DeskTopService {
 	static final String GET_PROCESS_UNDO_GROUP=" SELECT * FROM (SELECT JPROCESSVIEW.*,EM_IMID, ROW_NUMBER() OVER(ORDER BY JP_ID,JP_LAUNCHTIME) RN FROM JPROCESSVIEW LEFT JOIN EMPLOYEE ON EM_CODE=JP_LAUNCHERID WHERE JP_NODEDEALMAN=? AND JP_STATUS='待审批' OR (JP_LAUNCHERID=? AND JP_STATUS='未通过' )   ORDER BY JP_ID,JP_LAUNCHTIME) WHERE RN<=?  ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 END";
 	static final String GET_PROCESS_UNDO_GROUP_U="SELECT * FROM (SELECT JPROCESSVIEW.*,EM_IMID, ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME DESC,JP_ID DESC) RN FROM JPROCESSVIEW LEFT JOIN EMPLOYEE ON EM_CODE=JP_LAUNCHERID WHERE ((JP_NODEDEALMAN= ? AND JP_STATUS='待审批' ) AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_LAUNCHERNAME) LIKE ? ) OR ((JP_LAUNCHERID= ? AND JP_STATUS='未通过')  AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_PROCESSNOTE) LIKE ? )) WHERE RN<=? AND RN>=? ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 WHEN 'unprocess' THEN 4 END,RN ASC";
 	static final String GET_PROCESS_TOLUANCH="SELECT  * FROM (SELECT PAGELINK,CODE,TITLE,ROWNUM RN FROM table(GET_REMINDDATA(?))) WHERE RN<=?";
-	static final String GET_PROCESS_ALREADYDO="SELECT * FROM (SELECT JN_NAME,JN_INFORECEIVER||JN_OPERATEDDESCRIPTION JN_OPERATEDDESCRIPTION,JN_NODEDESCRIPTION,JN_DEALMANID,JN_DEALMANNAME,JN_DEALTIME,JN_DEALRESULT,JP_CODEVALUE,JP_NODEID,JP_KEYVALUE,JP_NAME,JP_LAUNCHERID,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN,JP_LAUNCHERNAME,EM_IMID  FROM JNODE LEFT JOIN JPROCESS ON JN_PROCESSINSTANCEID=JP_PROCESSINSTANCEID AND JN_NAME=JP_NODENAME LEFT JOIN EMPLOYEE ON EM_CODE=JPROCESS.JP_LAUNCHERID WHERE JP_CODEVALUE IS NOT NULL AND JN_DEALMANID=? ORDER BY JN_DEALTIME DESC)WHERE RN<=?";
+	static final String GET_PROCESS_ALREADYDO="SELECT * FROM (SELECT JN_NAME,JN_INFORECEIVER||JN_OPERATEDDESCRIPTION JN_OPERATEDDESCRIPTION,JN_NODEDESCRIPTION,JN_DEALMANID,JN_DEALMANNAME,JN_DEALTIME,JN_DEALRESULT,JP_CODEVALUE,JP_NODEID,JP_KEYVALUE,JP_NAME,JP_LAUNCHERID,JP_PROCESSNOTE,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN,JP_LAUNCHERNAME,EM_IMID  FROM JNODE LEFT JOIN JPROCESS ON JN_PROCESSINSTANCEID=JP_PROCESSINSTANCEID AND JN_NAME=JP_NODENAME LEFT JOIN EMPLOYEE ON EM_CODE=JPROCESS.JP_LAUNCHERID WHERE JP_CODEVALUE IS NOT NULL AND JN_DEALMANID=? ORDER BY JN_DEALTIME DESC)WHERE RN<=?";
 	static final String GET_PROCESS_ALREADYDO_U="SELECT * FROM (SELECT JN_NAME,JN_INFORECEIVER||JN_OPERATEDDESCRIPTION JN_OPERATEDDESCRIPTION,JN_NODEDESCRIPTION,JN_DEALMANID,JN_DEALMANNAME,JN_DEALTIME,JN_DEALRESULT,JP_CODEVALUE,JP_NODEID,JP_KEYVALUE,JP_NAME,JP_LAUNCHERID,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN,JP_LAUNCHERNAME,EM_IMID FROM JNODE LEFT JOIN JPROCESS ON JN_PROCESSINSTANCEID=JP_PROCESSINSTANCEID AND JN_NAME=JP_NODENAME LEFT JOIN EMPLOYEE ON EM_CODE=JPROCESS.JP_LAUNCHERID WHERE JP_CODEVALUE IS NOT NULL AND CONCAT(CONCAT(JP_NAME,'#'||JP_LAUNCHERNAME),'#'||JP_CODEVALUE) LIKE ? AND JN_DEALMANID= ?)WHERE RN<=? AND RN >= ? ORDER BY RN ASC";
 	static final String GET_PROCESS_ALREADYLAUNCH="SELECT *  FROM (SELECT PROCESS_LAUNCH_VIEW.*,ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME DESC) RN FROM PROCESS_LAUNCH_VIEW WHERE JP_LAUNCHERID=? ORDER BY JP_LAUNCHTIME DESC) WHERE  RN<=?";
 	static final String GET_PROCESS_ALREADYLAUNCH_U="SELECT *  FROM (SELECT PROCESS_LAUNCH_VIEW.*,ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME DESC) RN FROM PROCESS_LAUNCH_VIEW WHERE CONCAT(CONCAT(CONCAT(JP_NODEDEALMANNAME,'#'||JP_NAME),'#'||JP_STATUS),'#'||JP_CODEVALUE) LIKE ? and JP_LAUNCHERID=? ) WHERE  RN<=? AND RN>=? ORDER BY RN ASC";