|
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpSession;
|
|
import javax.servlet.http.HttpSession;
|
|
|
|
|
|
|
|
+import cn.com.taiji.util.*;
|
|
import org.activiti.engine.runtime.ProcessInstance;
|
|
import org.activiti.engine.runtime.ProcessInstance;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -53,10 +54,6 @@ import cn.com.taiji.sys.dto.CodeDto;
|
|
import cn.com.taiji.sys.dto.UserDto;
|
|
import cn.com.taiji.sys.dto.UserDto;
|
|
import cn.com.taiji.sys.service.DeptService;
|
|
import cn.com.taiji.sys.service.DeptService;
|
|
import cn.com.taiji.sys.service.UserService;
|
|
import cn.com.taiji.sys.service.UserService;
|
|
-import cn.com.taiji.util.EasyPoiUtil;
|
|
|
|
-import cn.com.taiji.util.IKSegmenterUtil;
|
|
|
|
-import cn.com.taiji.util.Pagination;
|
|
|
|
-import cn.com.taiji.util.ToolUtil;
|
|
|
|
import cn.com.taiji.workflow.service.WorkflowService;
|
|
import cn.com.taiji.workflow.service.WorkflowService;
|
|
import cn.com.taiji.zhongxiao.domain.CommonAduitrecord;
|
|
import cn.com.taiji.zhongxiao.domain.CommonAduitrecord;
|
|
import cn.com.taiji.zhongxiao.domain.ReqdataitemXxx;
|
|
import cn.com.taiji.zhongxiao.domain.ReqdataitemXxx;
|
|
@@ -1758,7 +1755,9 @@ public class TinfoClassController {
|
|
// Dept userdept = deptService.findById(userInfo.getDeptid());
|
|
// Dept userdept = deptService.findById(userInfo.getDeptid());
|
|
String sql = "SELECT dept_id as id, creditno,dept_abbreviation,dept_desc,dept_index,dept_name as name,dept_property,dept_state,parent_id,pdeptids,xzqhcode,xzqhid,xzqhname,ywbmcode,ywbmid,ywbmname FROM deptinfo WHERE dept_id=?";
|
|
String sql = "SELECT dept_id as id, creditno,dept_abbreviation,dept_desc,dept_index,dept_name as name,dept_property,dept_state,parent_id,pdeptids,xzqhcode,xzqhid,xzqhname,ywbmcode,ywbmid,ywbmname FROM deptinfo WHERE dept_id=?";
|
|
Map<String,Object> userdept = jdbcTemplate.queryForMap(sql, new Object[]{userInfo.getDeptid()});
|
|
Map<String,Object> userdept = jdbcTemplate.queryForMap(sql, new Object[]{userInfo.getDeptid()});
|
|
|
|
+ Map<String,Object> parentDept = jdbcTemplate.queryForMap(sql, new Object[]{userdept.get("parent_id")});
|
|
model.addAttribute("userdept", userdept);
|
|
model.addAttribute("userdept", userdept);
|
|
|
|
+ model.addAttribute("parentDept", parentDept);
|
|
|
|
|
|
dto = tinfoClassService.getDefaultInfoByUserId(userInfo.getUserId());
|
|
dto = tinfoClassService.getDefaultInfoByUserId(userInfo.getUserId());
|
|
List<CodeDto> list = dbdcCodeService.findCodeByCodeType("xxzygs");// 获取信息资源格式
|
|
List<CodeDto> list = dbdcCodeService.findCodeByCodeType("xxzygs");// 获取信息资源格式
|