1、添加各表单文本框数据展示

2、workflow修改字段大小写，展示办件中心各列表数据，及表单详情

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ApplicationInfo/index.ftl

@@ -78,7 +78,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 <div class="z-form-row">
                                     <div class="z-form-control z-col-85 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$applicationContent">
-                                            <textarea></textarea>
+                                            <textarea>${formEntity.applicationContent!}</textarea>
                                         </div>
                                     </div>
                                 </div>

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/BudgetReport/index.ftl

@@ -103,7 +103,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 <div class="z-form-row">
                                     <div class="z-form-control z-col-100 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$applicationBasis">
-                                            <textarea></textarea>
+                                            <textarea>${formEntity.applicationBasis!}</textarea>
                                         </div>
                                     </div>
                                 </div>

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ConsultationReply/index.ftl

@@ -93,7 +93,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 <div class="z-form-row">
                                     <div class="z-form-control z-col-100 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$consultationContent">
-                                            <textarea></textarea>
+                                            <textarea>${formEntity.consultationContent!}</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -145,7 +145,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                  <div class="z-form-row">
                                      <div class="z-form-control z-col-100 z-form-table">
                                          <div class="z-comp-textarea" name="createReqVO$homeAddress">
-                                             <textarea></textarea>
+                                             <textarea>${formEntity.homeAddress!}</textarea>
                                          </div>
                                      </div>
                                  </div>
@@ -157,7 +157,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                  <div class="z-form-row">
                                      <div class="z-form-control z-col-100 z-form-table">
                                          <div class="z-comp-textarea" name="createReqVO$other">
-                                             <textarea></textarea>
+                                             <textarea>${formEntity.other!}</textarea>
                                          </div>
                                      </div>
                                  </div>

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/FundPaymentRegistration/index.ftl

@@ -265,7 +265,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 <div class="z-form-row">
                                     <div class="z-form-control z-col-100 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$remarks">
-                                            <textarea></textarea>
+                                            <textarea>${formEntity.remarks!}</textarea>
                                         </div>
                                     </div>
                                 </div>

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/MeetingNotice/index.ftl

@@ -124,7 +124,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 <div class="z-form-row">
                                     <div class="z-form-control z-col-100 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$meetingContent">
-                                            <textarea></textarea>
+                                            <textarea>${formEntity.meetingContent!}</textarea>
                                         </div>
                                     </div>
                                 </div>

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ProjectInfo/index.ftl

@@ -310,7 +310,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 <div class="z-form-row">
                                     <div class="z-form-control z-col-100 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$remarks">
-                                            <textarea></textarea>
+                                            <textarea>${formEntity.remarks!}</textarea>
                                         </div>
                                     </div>
                                 </div>

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/IFlowHandlerCaseService.java

@@ -775,10 +775,12 @@ public class IFlowHandlerCaseService {
             Set<String> aIdSets = new HashSet<>();
             for (Map item : list) {
                 String fid, aid;
-                if (!StringUtils.isBlank(fid = ConvertUtils.toString(item.get("FLOWINSID")))) {
+//                if (!StringUtils.isBlank(fid = ConvertUtils.toString(item.get("FLOWINSID")))) {
+                if (!StringUtils.isBlank(fid = ConvertUtils.toString(item.get("flowInsId")))) {
                     fIdSets.add(fid);
                 }
-                if (!StringUtils.isBlank(aid = ConvertUtils.toString(item.get("ACTIVITYINSID")))) {
+//                if (!StringUtils.isBlank(aid = ConvertUtils.toString(item.get("ACTIVITYINSID")))) {
+                if (!StringUtils.isBlank(aid = ConvertUtils.toString(item.get("activityInsId")))) {
                     aIdSets.add(aid);
                 }
             }
@@ -792,13 +794,15 @@ public class IFlowHandlerCaseService {
                 String fid, aid, startNodeId = null;
                 IFlowInstance iFlowInstance = null;
                 IActivityInstance iActivityInstance = null;
-                if (!StringUtils.isBlank(fid = ConvertUtils.toString(item.get("FLOWINSID")))) {
+//                if (!StringUtils.isBlank(fid = ConvertUtils.toString(item.get("FLOWINSID")))) {
+                if (!StringUtils.isBlank(fid = ConvertUtils.toString(item.get("flowInsId")))) {
                     Optional<IFlowInstance> optional = flowInstanceList.stream().filter(t -> t.getId().equals(fid)).findFirst();
                     if (optional.isPresent()) {
                         iFlowInstance = optional.get();
                     }
                 }
-                if (!StringUtils.isBlank(aid = ConvertUtils.toString(item.get("ACTIVITYINSID")))) {
+//                if (!StringUtils.isBlank(aid = ConvertUtils.toString(item.get("ACTIVITYINSID")))) {
+                if (!StringUtils.isBlank(aid = ConvertUtils.toString(item.get("activityInsId")))) {
                     Optional<IActivityInstance> optional = activityInstanceList.stream().filter(t -> t.getId().equals(aid)).findFirst();
                     if (optional.isPresent()) {
                         iActivityInstance = optional.get();
@@ -826,7 +830,8 @@ public class IFlowHandlerCaseService {
             if (!params.isEmpty()) {
                 BtnUtil.getBtnListByHandlerCase(params);
                 for (Map item : params) {
-                    Optional<Map> optional = list.stream().filter(t -> ConvertUtils.toString(t.get("ACTIVITYINSID")).equals(ConvertUtils.toString(item.get("activityInstanceId")))).findFirst();
+//                    Optional<Map> optional = list.stream().filter(t -> ConvertUtils.toString(t.get("ACTIVITYINSID")).equals(ConvertUtils.toString(item.get("activityInstanceId")))).findFirst();
+                    Optional<Map> optional = list.stream().filter(t -> ConvertUtils.toString(t.get("activityInsId")).equals(ConvertUtils.toString(item.get("activityInstanceId")))).findFirst();
                     optional.ifPresent(map -> map.put("btnArrJson", item.get("btnArrJson")));
                 }
             }

zjugis-workflow/src/main/resources/mapper/postgresql/IFlowInstanceMapper.xml

@@ -3617,4 +3617,160 @@
           AND FI.ID != #{p.flowInstanceId}
         ORDER BY AIP.CREATE_TIME DESC NULLS LAST
     </select>
+
+    <select id="listHandlerCaseCountByArchive" resultType="java.util.Map">
+        with cte_handler as(
+        select
+        ai.id activityInsId,
+        fi.id flowInsId,
+        fi.SHOULD_FINISH_TIME F_SHOULD_FINISH_TIME,
+        ai.index_code,
+        fi.HANDLE_SOURCE,
+        ai.create_worker,
+        ai.create_time,
+        ai.latest_modify_worker,
+        ai.latest_modify_time,
+        ai.flow_template_version_id,
+        ai.flow_instance_id,
+        ai.activity_template_id,
+        ai.start_time STARTTIME,
+        ai.end_time,
+        ai.should_finish_time,
+        ai.status,
+        ai.i_end,
+        ai.i_public,
+        aip.id participantId,
+        aip.user_id RECEIVEUSERID,
+        aip.RECEIVE_TIME,
+        fi.CODE,
+        ai.NAME ACTIVITYNAME,
+        fi.NAME,
+        aip.FINISH_TIME,
+        fi.DESCRIBTION,
+        AI.I_WORK_DAY AIWORKDAY,
+        FI.I_WORK_DAY FIWORKDAY,
+        AI.TIME_LIMIT TIMELIMIT
+        from i_activity_instance ai
+        inner join i_activity_ins_participant aip on ai.id = aip.activity_instance_id
+        inner join i_flow_instance fi on ai.flow_instance_id=fi.id AND fi.I_END = 1
+        <if test="p.isMobile">
+            inner join i_acti_ins_rel_form af on af.activity_instance_id = ai.id
+        </if>
+        <if test="p.flowTemIds != null and p.flowTemIds.size()>0">
+            inner join T_FLOW_TEMPLATE_VERSION tv on fi.flow_template_version_id= tv.id
+        </if>
+        where (fi.STATUS=1 OR fi.STATUS=90) AND (ai.STATUS=1 or ai.STATUS=90)
+        AND (aip.HANDLE_AUTHORITY = 0 OR aip.HANDLE_AUTHORITY = 2)
+        and aip.finish_time is not null
+        <if test="p.sTime != null and p.sTime  != ''">
+            AND aip.FINISH_TIME >= to_date(#{p.sTime},'yyyy-MM-dd')
+        </if>
+        <if test="p.eTime != null and p.eTime != ''">
+            AND aip.FINISH_TIME &lt;= to_date(#{p.eTime},'yyyy-MM-dd')
+        </if>
+        <if test="p.uIdList != null and p.uIdList.size>0">
+            <choose>
+                <when test="p.uIdList.size==1 ">
+                    <bind name="idList" value="p.uIdList[0]"/>
+                    <if test="idList !=null and  idList.size>0">
+                        <choose>
+                            <when test="idList.size==1">
+                                AND aip.user_id = #{idList[0]}
+                            </when>
+                            <otherwise>
+                                AND aip.user_id in
+                                <foreach collection="idList" item="id" open="(" close=")" separator=",">
+                                    #{id}
+                                </foreach>
+                            </otherwise>
+                        </choose>
+                    </if>
+                </when>
+                <otherwise>
+                    AND
+                    <foreach collection="p.uIdList" item="idList" open="(" close=")" separator="or">
+                        aip.user_id in
+                        <foreach collection="idList" item="id" open="(" close=")" separator=",">
+                            #{id}
+                        </foreach>
+                    </foreach>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="p.sysIdList != null and p.sysIdList.size>0">
+            <choose>
+                <when test="p.sysIdList.size==1 ">
+                    AND fi.TO_SYSTEM_ID= #{p.sysIdList[0]}
+                </when>
+                <otherwise>
+                    AND fi.TO_SYSTEM_ID in
+                    <foreach collection="p.sysIdList" item="id" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="p.flowTemIds != null and p.flowTemIds.size()>0">
+            <choose>
+                <when test="p.flowTemIds.size==1 ">
+                    AND tv.flow_template_id= #{p.flowTemIds[0]}
+                </when>
+                <otherwise>
+                    AND tv.flow_template_id in
+                    <foreach collection="p.flowTemIds" item="id" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="p.searchVal != null and  p.searchVal != '' ">
+            <bind name="searchVal" value="'%'+p.searchVal+'%'"/>
+            AND (fi.CODE LIKE #{searchVal} OR fi.DESCRIBTION LIKE #{searchVal} OR fi.name LIKE #{searchVal})
+        </if>
+        <if test="p.iTest != null">
+            AND (fi.I_TEST is NULL OR fi.I_TEST = 0 OR fi.I_TEST = 1)
+        </if>
+        <if test="p.iTest == null">
+            AND (fi.I_TEST is NULL OR fi.I_TEST = 0)
+        </if>
+        <if test="p.isMobile">
+            AND af.form_mobile_url IS NOT NULL
+        </if>
+        <if test="p.finishStartTime != null and p.finishStartTime !='' ">
+            AND aip.finish_time &gt;= to_date(#{p.finishStartTime},'yyyy-MM-dd')
+        </if>
+        <if test="p.finishEndTime != null and p.finishEndTime !='' ">
+            AND aip.finish_time &lt;= to_date(#{p.finishEndTime},'yyyy-MM-dd')
+        </if>
+        <if test="p.toSystemId != null and p.toSystemId.size > 0">
+            <choose>
+                <when test="p.toSystemId.size ==1 ">
+                    AND fi.TO_SYSTEM_ID = #{p.toSystemId[0]}
+                </when>
+                <otherwise>
+                    AND fi.TO_SYSTEM_ID IN
+                    <foreach collection="p.toSystemId" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="p.excludedSystemId != null and p.excludedSystemId.size > 0">
+            <choose>
+                <when test="p.excludedSystemId.size ==1 ">
+                    AND COALESCE(fi.TO_SYSTEM_ID,' ') != #{p.excludedSystemId[0]}
+                </when>
+                <otherwise>
+                    AND COALESCE(fi.TO_SYSTEM_ID,' ') NOT IN
+                    <foreach collection="p.excludedSystemId" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
+        </if>
+        )
+        select COALESCE(count(1), 0)NUM from (
+            select cte_handler.*,row_number() over(partition by flowInsId order by finish_time desc) rn from cte_handler) as t
+        where rn = 1
+    </select>
 </mapper>

zjugis-workflow/src/main/resources/templates/HandlerCaseCenter/js/config.js

@@ -96,26 +96,38 @@
 					label: "操作", name: 'action', align: "center", width: 108, frozen: true, fixed: true,
 					formatter: function (cellvalue, option, rowObject) {
 						var data = {
-							participantId: rowObject.PARTICIPANTID,
-							activityInsId: rowObject.ACTIVITYINSID,
-							flowInsId: rowObject.FLOWINSID,
+//							participantId: rowObject.PARTICIPANTID,
+							participantId: rowObject.participantid,
+//							activityInsId: rowObject.ACTIVITYINSID,
+							activityInsId: rowObject.activityinsid,
+//							flowInsId: rowObject.FLOWINSID,
+							flowInsId: rowObject.flowinsid,
 							btnArrJson: rowObject.btnArrJson,
-							desc: rowObject.DESCRIBTION
+//							desc: rowObject.DESCRIBTION
+							desc: rowObject.describtion
 						}
 						return '<div class="dropdownBtn" inject-data=' + encodeURIComponent(JSON.stringify(data)) + '></div>';
 					}
 				},
 				{label: 'btnArrJson', name: 'btnArrJson', hidden: true},
-				{label: 'participantId', name: "PARTICIPANTID", hidden: true},
-				{label: 'activityInsId', name: "ACTIVITYINSID", hidden: true, key: true},
-				{label: 'flowInsId', name: "FLOWINSID", hidden: true},
+//				{label: 'participantId', name: "PARTICIPANTID", hidden: true},
+				{label: 'participantId', name: "participantid", hidden: true},
+//				{label: 'activityInsId', name: "ACTIVITYINSID", hidden: true, key: true},
+				{label: 'activityInsId', name: "activityinsid", hidden: true, key: true},
+//				{label: 'flowInsId', name: "FLOWINSID", hidden: true},
+				{label: 'flowInsId', name: "flowinsid", hidden: true},
 				// {label: '办件来源', align: "center", name: "HANDLE_SOURCE", width: 80, fixed: true},
-				{label: '业务编号', align: "center", name: "CODE", width: 250, fixed: true},
+//				{label: '业务编号', align: "center", name: "CODE", width: 250, fixed: true},
+				{label: '业务编号', align: "center", name: "code", width: 250, fixed: true},
 				{label: '环节状态', align: "center", name: "statusVal", width: 90, fixed: true,},
-				{label: '流程描述', align: "left", name: "DESCRIBTION", minwidth: 600, formatter: gridConfig.descFormatter},
-				{label: '流程名称', align: "left", name: "NAME", width: 130, fixed: true},
-				{label: '办理环节', align: "center", name: "ACTIVITYNAME", width: 180, fixed: true},
-				{label: '接件时间', align: "center", name: "RECEIVE_TIME", width: 160, fixed: true,
+//				{label: '流程描述', align: "left", name: "DESCRIBTION", minwidth: 600, formatter: gridConfig.descFormatter},
+				{label: '流程描述', align: "left", name: "describtion", minwidth: 600, formatter: gridConfig.descFormatter},
+//				{label: '流程名称', align: "left", name: "NAME", width: 130, fixed: true},
+				{label: '流程名称', align: "left", name: "name", width: 130, fixed: true},
+//				{label: '办理环节', align: "center", name: "ACTIVITYNAME", width: 180, fixed: true},
+				{label: '办理环节', align: "center", name: "activityname", width: 180, fixed: true},
+//				{label: '接件时间', align: "center", name: "RECEIVE_TIME", width: 160, fixed: true,
+				{label: '接件时间', align: "center", name: "receive_time", width: 160, fixed: true,
 					formatter:function(cellvalue, option, rowObject){
 						return longToDate(cellvalue);
 					}
@@ -171,7 +183,8 @@
                             className: "btn btn-info",
                             onClick: function (rowObject, rowindex, link) {
                                 link.disabled();
-                                gridConfig.goHandler(rowObject.ACTIVITYINSID, rowObject.FLOWINSID, rowObject.DESCRIBTION, rowObject.PARTICIPANTID, true, null, function () {
+//                                gridConfig.goHandler(rowObject.ACTIVITYINSID, rowObject.FLOWINSID, rowObject.DESCRIBTION, rowObject.PARTICIPANTID, true, null, function () {
+                                gridConfig.goHandler(rowObject.activityinsid, rowObject.flowinsid, rowObject.describtion, rowObject.participantid, true, null, function () {
                                     link.enable();//启用
                                 });
                             }
@@ -194,11 +207,16 @@
                         }
                     ]
                 },
-                {label: 'participantId', name: "PARTICIPANTID", hidden: true},
-                {label: 'activityInsId', name: "ACTIVITYINSID", hidden: true},
-                {label: 'flowInsId', name: "FLOWINSID", hidden: true},
-                {label: "IEXT", name: "IEXT", hidden: true},
-                {label: '业务编号', align: "center", name: "CODE", width: 250, fixed: true},
+//                {label: 'participantId', name: "PARTICIPANTID", hidden: true},
+                {label: 'participantId', name: "participantid", hidden: true},
+//                {label: 'activityInsId', name: "ACTIVITYINSID", hidden: true},
+                {label: 'activityInsId', name: "activityinsid", hidden: true},
+//                {label: 'flowInsId', name: "FLOWINSID", hidden: true},
+                {label: 'flowInsId', name: "flowinsid", hidden: true},
+//                {label: "IEXT", name: "IEXT", hidden: true},
+                {label: "IEXT", name: "iext", hidden: true},
+//                {label: '业务编号', align: "center", name: "CODE", width: 250, fixed: true},
+                {label: '业务编号', align: "center", name: "code", width: 250, fixed: true},
                 {
                     label: '环节完成情况',
                     align: "center",
@@ -209,13 +227,17 @@
                 {
                     label: '流程描述',
                     align: "left",
-                    name: "DESCRIBTION",
+//                    name: "DESCRIBTION",
+                    name: "describtion",
                     minwidth: 600,
                     formatter: gridConfig.descFormatter
                 },
-                {label: '流程名称', align: "left", name: "NAME", width: 130, fixed: true},
-                {label: '完成环节', align: "center", name: "ACTIVITYNAME", width: 160, fixed: true},
-                {label: '完成时间', align: "center", name: "FINISH_TIME", width: 160, fixed: true,
+//                {label: '流程名称', align: "left", name: "NAME", width: 130, fixed: true},
+                {label: '流程名称', align: "left", name: "name", width: 130, fixed: true},
+//                {label: '完成环节', align: "center", name: "ACTIVITYNAME", width: 160, fixed: true},
+                {label: '完成环节', align: "center", name: "activityname", width: 160, fixed: true},
+//                {label: '完成时间', align: "center", name: "FINISH_TIME", width: 160, fixed: true,
+                {label: '完成时间', align: "center", name: "finish_time", width: 160, fixed: true,
                     formatter:function(cellvalue, option, rowObject){
                         return longToDate(cellvalue);
                     }
@@ -232,16 +254,20 @@
 							className: "btn btn-info",
 							onClick: function (rowObject, rowindex, link) {
 								link.disabled();
-								gridConfig.goHandler(rowObject.ACTIVITYINSID, rowObject.FLOWINSID, rowObject.DESCRIBTION, rowObject.PARTICIPANTID, true, null, function () {
+//								gridConfig.goHandler(rowObject.ACTIVITYINSID, rowObject.FLOWINSID, rowObject.DESCRIBTION, rowObject.PARTICIPANTID, true, null, function () {
+								gridConfig.goHandler(rowObject.activityinsid, rowObject.flowinsid, rowObject.describtion, rowObject.participantid, true, null, function () {
 									link.enable();//启用
 								});
 							}
 						}
 					]
 				},
-				{label: 'activityInsId', name: "ACTIVITYINSID", hidden: true},
-				{label: 'flowInsId', name: "FLOWINSID", hidden: true},
-				{label: '业务编号', align: "center", name: "CODE", width: 180, fixed: true},
+//				{label: 'activityInsId', name: "ACTIVITYINSID", hidden: true},
+				{label: 'activityInsId', name: "activityinsid", hidden: true},
+//				{label: 'flowInsId', name: "FLOWINSID", hidden: true},
+				{label: 'flowInsId', name: "flowinsid", hidden: true},
+//				{label: '业务编号', align: "center", name: "CODE", width: 180, fixed: true},
+				{label: '业务编号', align: "center", name: "code", width: 180, fixed: true},
 				{
 					label: '退至环节完成情况',
 					align: "center",
@@ -252,22 +278,29 @@
 				{
 					label: '流程描述',
 					align: "left",
-					name: "DESCRIBTION",
+//					name: "DESCRIBTION",
+					name: "describtion",
 					minwidth: 600,
 					formatter: gridConfig.descFormatter
 				},
-				{label: '流程名称', align: "left", name: "NAME", width: 180, fixed: true},
-				{label: '被退环节', align: "center", name: "BACTIVITYNAME", width: 180, fixed: true},
-				{label: '退至环节', align: "center", name: "ACTIVITYNAME", width: 180, fixed: true},
-				{label: '退回时间', align: "center", name: "CREATE_TIME", width: 160, fixed: true,
+//				{label: '流程名称', align: "left", name: "NAME", width: 180, fixed: true},
+				{label: '流程名称', align: "left", name: "name", width: 180, fixed: true},
+//				{label: '被退环节', align: "center", name: "BACTIVITYNAME", width: 180, fixed: true},
+				{label: '被退环节', align: "center", name: "bactivityname", width: 180, fixed: true},
+//				{label: '退至环节', align: "center", name: "ACTIVITYNAME", width: 180, fixed: true},
+				{label: '退至环节', align: "center", name: "activityname", width: 180, fixed: true},
+//				{label: '退回时间', align: "center", name: "CREATE_TIME", width: 160, fixed: true,
+				{label: '退回时间', align: "center", name: "create_time", width: 160, fixed: true,
 					formatter:function(cellvalue, option, rowObject){
 						return longToDate(cellvalue);
 					}},
-				{label: '退至环节完成时间', align: "center", name: "END_TIME", width: 160, fixed: true,
+//				{label: '退至环节完成时间', align: "center", name: "END_TIME", width: 160, fixed: true,
+				{label: '退至环节完成时间', align: "center", name: "end_time", width: 160, fixed: true,
 					formatter:function(cellvalue, option, rowObject){
 						return longToDate(cellvalue);
 					}},
-				{label: '退回原因', align: "center", name: "BACK_REASON", width: 160, fixed: true}
+//				{label: '退回原因', align: "center", name: "BACK_REASON", width: 160, fixed: true}
+				{label: '退回原因', align: "center", name: "back_reason", width: 160, fixed: true}
 			];
 		}, //已退回
 		getHangUpGridModel: function () { /*已挂起grid列配置*/
@@ -330,6 +363,7 @@
 							onClick: function (rowObject, rowindex, link) {
 								link.disabled();//禁用
 								gridConfig.goHandler(rowObject.ACTIVITYINSID, rowObject.FLOWINSID, rowObject.DESCRIBTION, "", true, null, function () {
+//								gridConfig.goHandler(rowObject.activityinsid, rowObject.flowinsid, rowObject.describtion, "", true, null, function () {
 									link.enable();//启用
 								});
 							}
@@ -351,14 +385,17 @@
 					]
 				},
 				{label: '作废申请ID', name: "nullyId", hidden: true},
-				{label: '活动实例ID', name: "ACTIVITYINSID", hidden: true},
-				{label: '流程实例ID', name: "FLOWINSID", hidden: true},
+//				{label: '活动实例ID', name: "ACTIVITYINSID", hidden: true},
+				{label: '活动实例ID', name: "activityinsid", hidden: true},
+//				{label: '流程实例ID', name: "FLOWINSID", hidden: true},
+				{label: '流程实例ID', name: "flowinsid", hidden: true},
 				{label: '作废人', align: "left", name: "nullyUserName", width: 120, fixed: true},
 				{label: '业务编号', align: "center", name: "flowCode", width: 180, fixed: true},
 				{
 					label: '流程描述',
 					align: "left",
-					name: "DESCRIBTION",
+//					name: "DESCRIBTION",
+					name: "describtion",
 					minwidth: 600,
 					formatter: gridConfig.descFormatter
 				},