ljy121 1 gadu atpakaļ
vecāks
revīzija
708d8c9408
17 mainītis faili ar 185 papildinājumiem un 81 dzēšanām
  1. 0 0
      LOG_FILE_IS_UNDEFINED
  2. 26 0
      zjugis-business/src/main/java/com/zjugis/business/flow/project/event/ProjectEvent.java
  3. 7 0
      zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/api/dept/PostApi.java
  4. 12 0
      zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/api/permission/RoleApi.java
  5. 25 0
      zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/api/dept/PostApiImpl.java
  6. 42 0
      zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/api/permission/RoleApiImpl.java
  7. 2 0
      zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/convert/dept/PostConvert.java
  8. 5 0
      zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/convert/permission/RoleConvert.java
  9. 5 0
      zjugis-workflow/pom.xml
  10. 2 3
      zjugis-workflow/src/main/java/com/zjugis/z_workflow/ZWorkflowApplication.java
  11. 1 1
      zjugis-workflow/src/main/java/com/zjugis/z_workflow/config/FileWebMvcConfig.java
  12. 2 2
      zjugis-workflow/src/main/java/com/zjugis/z_workflow/dao/IActivityInstanceDao.java
  13. 0 29
      zjugis-workflow/src/main/java/com/zjugis/z_workflow/remote/PositionClient.java
  14. 0 29
      zjugis-workflow/src/main/java/com/zjugis/z_workflow/remote/RoleClient.java
  15. 6 6
      zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/CallInterfaceService.java
  16. 3 3
      zjugis-workflow/src/main/resources/mapper/oracle/IActivityInstanceMapper.xml
  17. 47 8
      zjugis-workflow/src/main/resources/templates/HandlerCaseCenter/js/config.js

+ 0 - 0
LOG_FILE_IS_UNDEFINED


+ 26 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/project/event/ProjectEvent.java

@@ -237,4 +237,30 @@ public class ProjectEvent extends BaseController {
             throw new BusinessException("执行事件出错,请联系管理员!");
         }
     }
+
+
+    @PostMapping("/to-market-manager")
+    public String toMarketManager(String flowInstanceId) {
+        try {
+            if (StringUtils.isNotBlank(flowInstanceId)) {
+                Project entity = projectService.selectByInstanceId(flowInstanceId);
+                List<Map<String, String>> userMaps = new ArrayList<>();
+                if(StringUtils.isNotBlank(entity.getXsryId())){
+                    CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUserLeader(entity.getXsryId());
+                    AdminUserRespDTO userLeader = userRes.getCheckedData();
+                    if(userLeader != null){
+                        HashMap<String,String> leaderMap = new HashMap<>();
+                        leaderMap.put("id",userLeader.getId());
+                        userMaps.add(leaderMap);
+                    }
+                }
+                return ok(userMaps);
+            } else {
+                throw new BusinessException("找不到流程id");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            throw new BusinessException("执行事件出错,请联系管理员!");
+        }
+    }
 }

+ 7 - 0
zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/api/dept/PostApi.java

@@ -26,4 +26,11 @@ public interface PostApi {
 
     @GetMapping(PREFIX + "/list-by-user-id")
     CommonResult<List<PostRespDTO>> getPostByUser(@RequestParam("userId") String userId);
+
+
+    @GetMapping(PREFIX + "/list-all")
+    CommonResult<List<PostRespDTO>> getPostList();
+
+    @GetMapping( PREFIX + "/get")
+    CommonResult<PostRespDTO> getPost(@RequestParam("id") Long id);
 }

+ 12 - 0
zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/api/permission/RoleApi.java

@@ -1,6 +1,7 @@
 package com.zjugis.module.system.api.permission;
 
 import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.module.system.api.permission.dto.RoleRespDto;
 import com.zjugis.module.system.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,4 +27,15 @@ public interface RoleApi {
 
     @GetMapping(PREFIX + "/list-by-user-id")
     CommonResult<List<RoleRespDto>> getRoleByUser(@RequestParam("userId") String userId);
+
+    @GetMapping(PREFIX + "/list-all")
+    CommonResult<List<RoleRespDto>> getRoleList();
+
+
+    @GetMapping(PREFIX + "/get")
+    CommonResult<RoleRespDto> get(@RequestParam("id") Long id);
+
+
+    @GetMapping(PREFIX + "/page")
+    CommonResult<PageResult<RoleRespDto>> getRolePage(@RequestParam("pageNo") long pageNo, @RequestParam("pageSize") long pageSize, @RequestParam("code") String code, @RequestParam("name") String name);
 }

+ 25 - 0
zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/api/dept/PostApiImpl.java

@@ -1,5 +1,6 @@
 package com.zjugis.module.system.api.dept;
 
+import com.zjugis.framework.common.enums.CommonStatusEnum;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.module.system.api.dept.dto.PostRespDTO;
 import com.zjugis.module.system.convert.dept.PostConvert;
@@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import static com.zjugis.framework.common.pojo.CommonResult.success;
@@ -33,4 +36,26 @@ public class PostApiImpl implements PostApi {
         return success(PostConvert.INSTANCE.convertList4(list));
     }
 
+
+    /**
+     * @return
+     */
+    @Override
+    public CommonResult<List<PostRespDTO>> getPostList() {
+        // 获得岗位列表,只要开启状态的
+        List<PostDO> list = postService.getPostList(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus()));
+        // 排序后,返回给前端
+        list.sort(Comparator.comparing(PostDO::getSort));
+        return success(PostConvert.INSTANCE.convertList4(list));
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    public CommonResult<PostRespDTO> getPost(Long id) {
+        return success(PostConvert.INSTANCE.convert03(postService.getPost(id)));
+    }
+
 }

+ 42 - 0
zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/api/permission/RoleApiImpl.java

@@ -1,7 +1,10 @@
 package com.zjugis.module.system.api.permission;
 
+import com.zjugis.framework.common.enums.CommonStatusEnum;
 import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.module.system.api.permission.dto.RoleRespDto;
+import com.zjugis.module.system.controller.admin.permission.vo.role.RolePageReqVO;
 import com.zjugis.module.system.convert.permission.RoleConvert;
 import com.zjugis.module.system.dal.dataobject.permission.RoleDO;
 import com.zjugis.module.system.service.permission.RoleService;
@@ -10,9 +13,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 
 import static com.zjugis.framework.common.pojo.CommonResult.success;
+import static java.util.Collections.singleton;
 
 @RestController // 提供 RESTful API 接口,给 Feign 调用
 @Validated
@@ -36,4 +41,41 @@ public class RoleApiImpl implements RoleApi {
         List<RoleDO> list = roleService.getRoleListByUserId(userId);
         return success(RoleConvert.INSTANCE.convertList4(list));
     }
+
+    /**
+     * @return
+     */
+    @Override
+    public CommonResult<List<RoleRespDto>> getRoleList() {
+        List<RoleDO> list = roleService.getRoleListByStatus(singleton(CommonStatusEnum.ENABLE.getStatus()));
+        // 排序后,返回给前端
+        list.sort(Comparator.comparing(RoleDO::getSort));
+        return success(RoleConvert.INSTANCE.convertList4(list));
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    public CommonResult<RoleRespDto> get(Long id) {
+        RoleDO role = roleService.getRole(id);
+        return success(RoleConvert.INSTANCE.convert03(role));
+    }
+
+    /**
+     * @param pageNo
+     * @param pageSize
+     * @param code
+     * @param name
+     * @return
+     */
+    @Override
+    public CommonResult<PageResult<RoleRespDto>> getRolePage(long pageNo, long pageSize, String code, String name) {
+        RolePageReqVO reqVO = new RolePageReqVO();
+        reqVO.setPageNo((int) pageNo);
+        reqVO.setPageSize((int) pageSize);
+        reqVO.setName(name);
+        return success(RoleConvert.INSTANCE.convertPage(roleService.getRolePage(reqVO)));
+    }
 }

+ 2 - 0
zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/convert/dept/PostConvert.java

@@ -27,4 +27,6 @@ public interface PostConvert {
     List<PostExcelVO> convertList03(List<PostDO> list);
 
     List<PostRespDTO> convertList4(List<PostDO> list);
+
+    PostRespDTO convert03(PostDO bean);
 }

+ 5 - 0
zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/convert/permission/RoleConvert.java

@@ -1,5 +1,6 @@
 package com.zjugis.module.system.convert.permission;
 
+import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.module.system.api.permission.dto.RoleRespDto;
 import com.zjugis.module.system.controller.admin.permission.vo.role.*;
 import com.zjugis.module.system.dal.dataobject.permission.RoleDO;
@@ -27,4 +28,8 @@ public interface RoleConvert {
     RoleDO convert(RoleCreateReqBO bean);
 
     List<RoleRespDto> convertList4(List<RoleDO> list);
+
+    PageResult<RoleRespDto> convertPage(PageResult<RoleDO> rolePage);
+
+    RoleRespDto convert03(RoleDO bean);
 }

+ 5 - 0
zjugis-workflow/pom.xml

@@ -33,6 +33,11 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-indexer</artifactId>
+            <version>5.3.29</version>
+        </dependency>
         <dependency>
             <groupId>com.zjugis.cloud</groupId>
             <artifactId>zjugis-spring-boot-starter-mybatis</artifactId>

+ 2 - 3
zjugis-workflow/src/main/java/com/zjugis/z_workflow/ZWorkflowApplication.java

@@ -2,10 +2,9 @@ package com.zjugis.z_workflow;
 
 import com.zjugis.module.system.api.amqp.AmqpApi;
 import com.zjugis.module.system.api.dept.DeptApi;
+import com.zjugis.module.system.api.dept.PostApi;
 import com.zjugis.module.system.api.permission.RoleApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
-import com.zjugis.z_workflow.remote.PositionClient;
-import com.zjugis.z_workflow.remote.RoleClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -22,7 +21,7 @@ import java.util.TimeZone;
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableAsync
-@EnableFeignClients(clients = {AdminUserApi.class, RoleClient.class, PositionClient.class, DeptApi.class, RoleApi.class, AmqpApi.class})
+@EnableFeignClients(clients = {AdminUserApi.class, PostApi.class, DeptApi.class, RoleApi.class, AmqpApi.class})
 @EnableDiscoveryClient
 @ComponentScan({"com.zjugis.z_workflow.*"})
 @RefreshScope

+ 1 - 1
zjugis-workflow/src/main/java/com/zjugis/z_workflow/config/FileWebMvcConfig.java

@@ -1,7 +1,7 @@
 package com.zjugis.z_workflow.config;
 
 import com.zjugis.z_workflow.utils.GlobalConstant;
-import org.springframework.boot.system  .ApplicationHome;
+import org.springframework.boot.system.ApplicationHome;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

+ 2 - 2
zjugis-workflow/src/main/java/com/zjugis/z_workflow/dao/IActivityInstanceDao.java

@@ -35,7 +35,7 @@ public interface IActivityInstanceDao extends ZjugisBaseMapper<IActivityInstance
 	 * @param activityInsId 活动实例ID
 	 * @return
 	 */
-	List<String> listInCompleteActivity(String flowInsId, String activityInsId);
+	List<String> listInCompleteActivity(@Param("flowInsId")String flowInsId, @Param("activityInsId")String activityInsId);
 
 	/**
 	 * 根据外部流程实例ID查找未完成的节点
@@ -52,7 +52,7 @@ public interface IActivityInstanceDao extends ZjugisBaseMapper<IActivityInstance
 	 * @param externalActivityInsId
 	 * @return
 	 */
-	List<Map<String, Object>> findExternalActivityInstanceFormList(String flowInsId, String externalActivityInsId);
+	List<Map<String, Object>> findExternalActivityInstanceFormList(@Param("flowInsId") String flowInsId,@Param("externalActivityInsId") String externalActivityInsId);
 
 	/**
 	 * 根据流程模板版本ID、流程实例ID获取活动实例、模板信息

+ 0 - 29
zjugis-workflow/src/main/java/com/zjugis/z_workflow/remote/PositionClient.java

@@ -1,29 +0,0 @@
-package com.zjugis.z_workflow.remote;
-
-/**
- * @author ljy
- * @version 1.0
- * @date 2023/11/1 9:13
- */
-
-import com.zjugis.framework.common.pojo.CommonResult;
-import com.zjugis.framework.common.pojo.PageResult;
-import com.zjugis.module.system.api.dept.dto.PostRespDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-@FeignClient(value = "system-server",path = "/admin-api/system/post")
-public interface PositionClient {
-
-    @GetMapping("/page")
-    CommonResult<PageResult<PostRespDTO>> getPostPage(@RequestParam("pageNo") long pageNo, @RequestParam("pageSize") long pageSize, @RequestParam("name") String name );
-
-    @GetMapping("/list-all-simple")
-    CommonResult<List<PostRespDTO>> getSimplePostList();
-
-    @GetMapping(value = "/get")
-    CommonResult<PostRespDTO> getPost(@RequestParam("id") Long id);
-}

+ 0 - 29
zjugis-workflow/src/main/java/com/zjugis/z_workflow/remote/RoleClient.java

@@ -1,29 +0,0 @@
-package com.zjugis.z_workflow.remote;
-
-import com.zjugis.framework.common.pojo.CommonResult;
-import com.zjugis.framework.common.pojo.PageResult;
-import com.zjugis.module.system.api.permission.dto.RoleRespDto;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-/**
- * @author ljy
- * @version 1.0
- * @date 2023/10/31 18:23
- */
-@FeignClient(value = "system-server",path = "/admin-api/system/role")
-public interface RoleClient {
-
-    @GetMapping("/list-all-simple")
-    CommonResult<List<RoleRespDto>> getSimpleRoleList();
-
-    @GetMapping("/get")
-    CommonResult<RoleRespDto> get(@RequestParam("id") Long id);
-
-    @GetMapping("/page")
-    CommonResult<PageResult<RoleRespDto>> getRolePage(@RequestParam("pageNo") long pageNo, @RequestParam("pageSize") long pageSize, @RequestParam("code") String code, @RequestParam("name") String name);
-
-}

+ 6 - 6
zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/CallInterfaceService.java

@@ -10,8 +10,10 @@ import com.zjugis.framework.common.exception.ServiceException;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.module.system.api.dept.DeptApi;
+import com.zjugis.module.system.api.dept.PostApi;
 import com.zjugis.module.system.api.dept.dto.DeptRespDTO;
 import com.zjugis.module.system.api.dept.dto.PostRespDTO;
+import com.zjugis.module.system.api.permission.RoleApi;
 import com.zjugis.module.system.api.permission.dto.RoleRespDto;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
@@ -21,8 +23,6 @@ import com.zjugis.z_workflow.dto.FormDto;
 import com.zjugis.z_workflow.dto.RoleDto;
 import com.zjugis.z_workflow.entity.CodeTemplate;
 import com.zjugis.z_workflow.entity.Form;
-import com.zjugis.z_workflow.remote.PositionClient;
-import com.zjugis.z_workflow.remote.RoleClient;
 import com.zjugis.z_workflow.utils.ServiceApiUtil;
 import com.zjugis.z_workflow.utils.YmlUtil;
 import com.zjugis.z_workflow.utils.zTree;
@@ -62,10 +62,10 @@ public class CallInterfaceService {
     CodeTemplateService codeTemplateService;
 
     @Autowired
-    private RoleClient roleClient;
+    private RoleApi roleClient;
 
     @Autowired
-    private PositionClient positionClient;
+    private PostApi positionClient;
 
     @Autowired
     private AdminUserApi adminUserClient;
@@ -230,7 +230,7 @@ public class CallInterfaceService {
 	public List<zTree> getPositionList() {
 		List<zTree> treeList = new ArrayList();
 		//获取接口返回数据
-        CommonResult<List<PostRespDTO>> result = positionClient.getSimplePostList();
+        CommonResult<List<PostRespDTO>> result = positionClient.getPostList();
         if(result.isError()){
 			throw new ServiceException(result.getCode(),result.getMsg());
 		}
@@ -279,7 +279,7 @@ public class CallInterfaceService {
 	public List<zTree> getRoleList() {
 		List<zTree> treeList = new ArrayList();
 		//获取接口返回数据
-        CommonResult<List<RoleRespDto>> result = roleClient.getSimpleRoleList();
+        CommonResult<List<RoleRespDto>> result = roleClient.getRoleList();
         if(result.isError()){
 			throw new ServiceException(result.getCode(),result.getMsg());
 		}

+ 3 - 3
zjugis-workflow/src/main/resources/mapper/oracle/IActivityInstanceMapper.xml

@@ -84,18 +84,18 @@
         (
             SELECT I.ID,I.NAME,I.ACTIVITY_TEMPLATE_ID
             FROM I_ACTIVITY_INSTANCE I
-            WHERE I.FLOW_INSTANCE_ID = #{flowInsId}
+            WHERE I.FLOW_INSTANCE_ID = #{flowInsId,jdbcType=VARCHAR}
             AND I.STATUS = 1
             UNION ALL
             SELECT I.ID,I.NAME,I.ACTIVITY_TEMPLATE_ID
             FROM I_ACTIVITY_INSTANCE I
-            WHERE I.FLOW_INSTANCE_ID = #{flowInsId}
+            WHERE I.FLOW_INSTANCE_ID = #{flowInsId,jdbcType=VARCHAR}
             AND I.STATUS = 20
         ) AI
         LEFT JOIN T_ACTIVITY_TEMPLATE T
         ON AI.ACTIVITY_TEMPLATE_ID = T.ID
         WHERE T.I_ARCHIVE_NO_NEEDED != 1
-        AND AI.ID != #{activityInsId}
+        AND AI.ID != #{activityInsId,jdbcType=VARCHAR}
     </select>
 
     <select id="listInExternalCompleteActivity" parameterType="String" resultType="String">

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

@@ -103,15 +103,25 @@
 				{label: 'participantId', name: "PARTICIPANTID", hidden: true},
 				{label: 'activityInsId', name: "ACTIVITYINSID", hidden: true, key: true},
 				{label: 'flowInsId', name: "FLOWINSID", hidden: true},
-				{label: '办件来源', align: "center", name: "HANDLE_SOURCE", width: 80, fixed: true},
+				// {label: '办件来源', align: "center", name: "HANDLE_SOURCE", width: 80, 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: "shouldFinishVal", width: 160, fixed: true},
-				{label: '流程剩余时间', align: "center", name: "fShouldFinishVal", width: 160, fixed: true},
-				{label: '接件时间', align: "center", name: "RECEIVE_TIME", width: 160, fixed: true}
+				{label: '环节剩余时间', align: "center", name: "shouldFinishVal", width: 160, fixed: true,
+					formatter:function(cellvalue, option, rowObject){
+						return longToDate(cellvalue);
+					}},
+				{label: '流程剩余时间', align: "center", name: "fShouldFinishVal", width: 160, fixed: true,
+					formatter:function(cellvalue, option, rowObject){
+						return longToDate(cellvalue);
+					}},
+				{label: '接件时间', align: "center", name: "RECEIVE_TIME", width: 160, fixed: true,
+					formatter:function(cellvalue, option, rowObject){
+						return longToDate(cellvalue);
+					}
+				}
 			];
 			z.ui.ajax({
 				url: "/ConfigCenter/getToDoColumns",
@@ -130,12 +140,19 @@
 							} else {
 								columnset.minwidth = item.displayWidth;
 							}
-							if (item.columnName == "DESCRIBTION") {
+							if (item.columnName === "DESCRIBTION") {
 								columnset.formatter = gridConfig.descFormatter;
 							}
-							if (item.columnName == "RECEIVE_TIME") {
+							if (item.columnName === "RECEIVE_TIME") {
+								columnset.formatter = longToDate;
 								iExistReceiveTime = true;
 							}
+							if (item.columnName === "shouldFinishVal") {
+								columnset.formatter = longToDate;
+							}
+							if (item.columnName === "fShouldFinishVal") {
+								columnset.formatter = longToDate;
+							}
 							columnSets.push(columnset);
 						});
 						if (!iExistReceiveTime) {
@@ -200,8 +217,16 @@
 				},
 				{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: "center", name: "SHOULD_FINISH_TIME", width: 160, fixed: true},
+				{label: '完成时间', align: "center", name: "FINISH_TIME", width: 160, fixed: true,
+					formatter:function(cellvalue, option, rowObject){
+						return longToDate(cellvalue);
+					}
+				},
+				{label: '截止时间', align: "center", name: "SHOULD_FINISH_TIME", width: 160, fixed: true,
+					formatter:function(cellvalue, option, rowObject){
+						return longToDate(cellvalue);
+					}
+					},
 				{label: '当前在办环节', align: "center", name: "currentActivityVal", width: 180, fixed: true}
 			];
 		}, //已完成
@@ -819,5 +844,19 @@
 
 		}//按行获取更多操作
 	}
+
+	function longToDate(long) {
+		if(!long){
+			return '';
+		}
+		var date = new Date(long);
+		var year = date.getFullYear();
+		var month = ("0" + (date.getMonth() + 1)).slice(-2);
+		var day = ("0" + date.getDate()).slice(-2);
+		var hour = ("0" + date.getHours()).slice(-2);
+		var minute = ("0" + date.getMinutes()).slice(-2);
+		var second = ("0" + date.getSeconds()).slice(-2);
+		return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
+	}
 	window.gridConfig = gridConfig || {};
 })();