Browse Source

处理前端数据问题

anderx 3 years ago
parent
commit
9c566cfdb3

+ 3 - 3
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -1,6 +1,6 @@
 package com.goafanti.admin.service;
 
-import com.goafanti.common.model.OrganizationManagement;
+import com.goafanti.common.model.Department;
 import com.goafanti.common.model.WorkingHours;
 
 import java.util.List;
@@ -24,8 +24,8 @@ public interface DepartmentService {
 	 * 查询分管部门、查询管理部门
 	 * @return
 	 */
-	List<OrganizationManagement> selectMyDeps();
+	List<Department> selectMyDeps();
 
 
-	List<OrganizationManagement> selectSubDeps(String subId);
+	List<Department> selectSubDeps(String subId);
 }

+ 9 - 15
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -10,8 +10,8 @@ import java.util.UUID;
 import javax.annotation.Resource;
 
 import com.goafanti.admin.service.DepartmentService;
-import com.goafanti.common.model.OrganizationManagement;
-import com.goafanti.order.service.OrderService;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.model.Department;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -25,12 +25,6 @@ import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.depCountBo;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminLocationMapper;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.UserBusinessMapper;
-import com.goafanti.common.dao.UserLockReleaseMapper;
-import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.utils.LoggerUtils;
@@ -55,7 +49,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Autowired
 	private UserBusinessMapper	userBusinessMapper;
 	@Autowired
-	private OrganizationManagementMapper	organizationManagementMapper;
+	private DepartmentMapper departmentMapper;
 	@Autowired
 	private DepartmentService departmentService;
 	@Resource(name = "passwordUtil")
@@ -376,18 +370,18 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		depCountBo acb=new depCountBo();
 		if (endTime!=null)endTime=endTime+" 23:59:59";
 		List<depCountBo >deps=new ArrayList<>();
-		List<OrganizationManagement> depIds=new ArrayList<>();
+		List<Department> depIds=new ArrayList<>();
 		if (depId==null) {
 			acb.setName("科德集团");
-			deps=organizationManagementMapper.selectBysuperName("科德集团");
+			deps=departmentMapper.selectBysuperName("科德集团");
 		}else {
-			OrganizationListOut oo=organizationManagementMapper.selectAllById(depId);
+			OrganizationListOut oo=departmentMapper.selectAllById(depId);
 			acb.setName(oo.getName());
 			acb.setId(depId);
-			deps=organizationManagementMapper.selectBysuperId(oo.getId());
+			deps=departmentMapper.selectBysuperId(oo.getId());
 			depIds =departmentService.selectSubDeps(depId);
 		}
-		List<AdminCustomerBo> list =organizationManagementMapper.AlldepCount(depIds,startTime,  endTime);
+		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
 		for (AdminCustomerBo ad : list) {
 			if (acb.getId().equals(ad.getDepId())){
 				acb.getaList().add(ad);
@@ -409,7 +403,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	//迭代获取所有部门与部门员工并计算出部门数量
 	private List<depCountBo> iterationDeps(String id,List<AdminCustomerBo> list) {
-		List<depCountBo>  deps =organizationManagementMapper.selectBysuperId(id);
+		List<depCountBo>  deps =departmentMapper.selectBysuperId(id);
 		for (depCountBo dep : deps) {
 			dep.setList(iterationDeps(dep.getId(),list));
 			for (AdminCustomerBo ad : list) {

+ 14 - 14
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.model.OrganizationManagement;
+import com.goafanti.common.dao.DepartmentMapper;
+import com.goafanti.common.model.Department;
 import com.goafanti.core.shiro.token.TokenManager;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	@Autowired
 	private WorkingHoursMapper	workingHoursMapper;
 	@Autowired
-	private OrganizationManagementMapper departmentMapper;
+	private DepartmentMapper departmentMapper;
 
 
 	@Override
@@ -64,7 +64,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	}
 
 	@Override
-	public List<OrganizationManagement> selectMyDeps() {
+	public List<Department> selectMyDeps() {
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))
 			return departmentMapper.selectAllDeps();
 		else
@@ -72,20 +72,20 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	}
 
 	@Override
-	public List<OrganizationManagement> selectSubDeps(String subId) {
-		List<OrganizationManagement>  list =departmentMapper.selectSubDeps(subId);
-		List<OrganizationManagement>  all=new ArrayList<>();
+	public List<Department> selectSubDeps(String subId) {
+		List<Department>  list =departmentMapper.selectSubDeps(subId);
+		List<Department>  all=new ArrayList<>();
 		all.add(departmentMapper.selectByPrimaryKey(subId));
 		all.addAll(list);
-		for (OrganizationManagement dep : list) {
+		for (Department dep : list) {
 			all.addAll(selectSubDeps(dep.getId()));
 		}
 		return all;
 	}
 
-	private List<OrganizationManagement> selectCurrentDep(String managerId){
-		List<OrganizationManagement> allData = new ArrayList<OrganizationManagement>();
-		List<OrganizationManagement> superData = departmentMapper.selectCurrentDeps(managerId);
+	private List<Department> selectCurrentDep(String managerId){
+		List<Department> allData = new ArrayList<Department>();
+		List<Department> superData = departmentMapper.selectCurrentDeps(managerId);
 		if(superData != null && superData.size()>0){
 			allData.addAll(superData);
 		}
@@ -93,10 +93,10 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		return allData;
 	}
 
-	private List<OrganizationManagement> selectSubDeps(List<OrganizationManagement> allData,List<OrganizationManagement> superData){
-		List<OrganizationManagement> subData = new ArrayList<>();
+	private List<Department> selectSubDeps(List<Department> allData,List<Department> superData){
+		List<Department> subData = new ArrayList<>();
 		String superIds = "";
-		for(OrganizationManagement om : superData){
+		for(Department om : superData){
 			if(!om.getId().equals(om.getSuperId())){
 				superIds += om.getId() + ",";
 			}

+ 4 - 6
src/main/java/com/goafanti/common/dao/DepartmentMapper.java

@@ -4,7 +4,6 @@ import com.goafanti.admin.bo.AdminCustomerBo;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.depCountBo;
 import com.goafanti.common.model.Department;
-import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.organization.bo.OrganizationListOut;
 import org.apache.ibatis.annotations.Param;
 
@@ -76,23 +75,22 @@ public interface DepartmentMapper {
      * @param superIds
      * @return
      */
-    List<OrganizationManagement> selectSubDeps(@Param("superIds")String superIds);
+    List<Department> selectSubDeps(@Param("superIds")String superIds);
 
     List<depCountBo> selectBysuperId(String id);
 
     List<depCountBo> selectBysuperName(String name);
     /**
      * 查询当前集合
-     * @param adminId
      * @return
      */
-    List<OrganizationManagement> selectCurrentDeps(@Param("aid")String aid);
+    List<Department> selectCurrentDeps(@Param("aid")String aid);
 
     /**
      * 查询所有部门
      * @return
      */
-    List<OrganizationManagement> selectAllDeps();
+    List<Department> selectAllDeps();
     /**
      * 查询最大编号
      * @param abbreviation
@@ -104,5 +102,5 @@ public interface DepartmentMapper {
                                     @Param("adminName")String adminName, @Param("startTime")String startTime, @Param("endTime")String endTime);
 
 
-    List<AdminCustomerBo> AlldepCount(@Param("depIds")List<OrganizationManagement> depIds ,@Param("startTime")String startTime, @Param("endTime")String endTime);
+    List<AdminCustomerBo> AlldepCount(@Param("depIds")List<Department> depIds ,@Param("startTime")String startTime, @Param("endTime")String endTime);
 }

+ 0 - 156
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -1,156 +0,0 @@
-package com.goafanti.common.dao;
-
-import java.util.List;
-
-import com.goafanti.organization.bo.OrganizationListOut;
-import com.goafanti.admin.bo.AdminCustomerBo;
-import com.goafanti.admin.bo.AdminListBo;
-import com.goafanti.admin.bo.depCountBo;
-import com.goafanti.common.model.OrganizationManagement;
-import com.goafanti.common.model.OrganizationManagementExample;
-
-import org.apache.ibatis.annotations.Param;
-
-public interface OrganizationManagementMapper {
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	long countByExample(OrganizationManagementExample example);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int deleteByExample(OrganizationManagementExample example);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int deleteByPrimaryKey(String id);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int insert(OrganizationManagement record);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int insertSelective(OrganizationManagement record);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	List<OrganizationManagement> selectByExample(OrganizationManagementExample example);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	OrganizationManagement selectByPrimaryKey(String id);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int updateByExampleSelective(@Param("record") OrganizationManagement record,
-			@Param("example") OrganizationManagementExample example);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int updateByExample(@Param("record") OrganizationManagement record,
-			@Param("example") OrganizationManagementExample example);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int updateByPrimaryKeySelective(OrganizationManagement record);
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	int updateByPrimaryKey(OrganizationManagement record);
-
-
-	List<OrganizationListOut> selectSuperId(@Param("sort")int sort);
-	/**
-	 * 根据组织名称查组织编号
-	 */
-	String selectDepNoByName(String name);
-
-	/**
-	 * 根据上级组织查组织编号
-	 */
-	String  selectDepNo(String id);
-	/**
-
-
-	/**
-	 * 查询相同上级下编号数量
-	 */
-	int selectDepNoCount(String superId);
-	/**
-	 * 模糊查询负责人名称
-	 */
-	List<AdminListBo> selectName(String name);
-
-	OrganizationListOut selectAllById(String id);
-
-	int deleteById(String id);
-
-	String selectAdminNameById(String name);
-
-	String selectIdByDepNo(String depNo);
-	/**
-	 * 查询有相同上级组织的信息
-	 * @param superId
-	 * @return
-	 */
-	List<OrganizationListOut> selectIDNBySuperId(String superId);
-
-	int updateByNumber(OrganizationListOut olo);
-
-	int selectCountBySuperId(String superId);
-
-	String selectIdByName(String name);
-
-	String selectNameById(String id);
-
-	String selectDepNoById(String id);
-
-	int selectUserById(String id);
-
-	/**
-	 * 查询下级集合
-	 * @param superIds
-	 * @return
-	 */
-	List<OrganizationManagement> selectSubDeps(@Param("superIds")String superIds);
-
-	List<depCountBo> selectBysuperId(String id);
-
-	List<depCountBo> selectBysuperName(String name);
-	/**
-	 * 查询当前集合
-	 * @param adminId
-	 * @return
-	 */
-	List<OrganizationManagement> selectCurrentDeps(@Param("aid")String aid);
-
-	/**
-	 * 查询所有部门
-	 * @return
-	 */
-	List<OrganizationManagement> selectAllDeps();
-	/**
-	 * 查询最大编号
-	 * @param abbreviation
-	 * @return
-	 */
-	String getMaxAbbreviation(String abbreviation);
-
-	List<AdminCustomerBo> getDepAll(@Param("depId")String depId,
-			@Param("adminName")String adminName,@Param("startTime")String startTime, @Param("endTime")String endTime);
-
-
-	List<AdminCustomerBo> AlldepCount(@Param("depIds")List<OrganizationManagement> depIds ,@Param("startTime")String startTime, @Param("endTime")String endTime);
-}

+ 0 - 697
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -1,697 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.OrganizationManagementMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationManagement">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="create_id" jdbcType="VARCHAR" property="createId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="deleted_sign" jdbcType="VARCHAR" property="deletedSign" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="manager_id" jdbcType="VARCHAR" property="managerId" />
-    <result column="dep_no" jdbcType="VARCHAR" property="depNo" />
-    <result column="super_id" jdbcType="VARCHAR" property="superId" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="abbreviation" jdbcType="VARCHAR" property="abbreviation" />
-    <result column="finance_id" jdbcType="VARCHAR" property="financeId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    id, create_id, create_time, update_time, deleted_sign, name, type, manager_id, dep_no,
-    super_id, remarks, status,abbreviation,finance_id
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from department
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    select
-    <include refid="Base_Column_List" />
-    from department
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    delete from department
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    delete from department
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationManagement">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    insert into department (id, create_id, create_time,
-      update_time, deleted_sign, name,
-      type, manager_id, dep_no, working_hours_type,
-      super_id, remarks, status
-      )
-    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-      #{updateTime,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-      #{type,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR}, #{workingHoursType,jdbcType=INTEGER},
-      #{superId,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationManagement">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    insert into department
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="createId != null">
-        create_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="deletedSign != null">
-        deleted_sign,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="managerId != null">
-        manager_id,
-      </if>
-      <if test="depNo != null">
-        dep_no,
-      </if>
-      <if test="superId != null">
-        super_id,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="createId != null">
-        #{createId,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deletedSign != null">
-        #{deletedSign,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="managerId != null">
-        #{managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="depNo != null">
-        #{depNo,jdbcType=VARCHAR},
-      </if>
-      <if test="superId != null">
-        #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    select count(*) from department
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    update department
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.deletedSign != null">
-        deleted_sign = #{record.deletedSign,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.managerId != null">
-        manager_id = #{record.managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.depNo != null">
-        dep_no = #{record.depNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.superId != null">
-        super_id = #{record.superId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    update department
-    set id = #{record.id,jdbcType=VARCHAR},
-      create_id = #{record.createId,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      deleted_sign = #{record.deletedSign,jdbcType=VARCHAR},
-      name = #{record.name,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=VARCHAR},
-      manager_id = #{record.managerId,jdbcType=VARCHAR},
-      dep_no = #{record.depNo,jdbcType=VARCHAR},
-      super_id = #{record.superId,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationManagement">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    update department
-    <set>
-      <if test="createId != null">
-        create_id = #{createId,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deletedSign != null">
-        deleted_sign = #{deletedSign,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="managerId != null">
-        manager_id = #{managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="depNo != null">
-        dep_no = #{depNo,jdbcType=VARCHAR},
-      </if>
-      <if test="superId != null">
-        super_id = #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="abbreviation != null">
-        abbreviation = #{abbreviation,jdbcType=VARCHAR},
-      </if>
-      <if test="financeId != null">
-        finance_id = #{financeId,jdbcType=VARCHAR},
-      </if>
-      <if test="province != null">
-        province = #{province},
-      </if>
-      <if test="workingHoursType !=null">
-      	working_hours_type= #{workingHoursType},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrganizationManagement">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Nov 30 11:09:29 CST 2017.
-    -->
-    update department
-    set create_id = #{createId,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      deleted_sign = #{deletedSign,jdbcType=VARCHAR},
-      name = #{name,jdbcType=VARCHAR},
-      type = #{type,jdbcType=VARCHAR},
-      manager_id = #{managerId,jdbcType=VARCHAR},
-      dep_no = #{depNo,jdbcType=VARCHAR},
-      super_id = #{superId,jdbcType=VARCHAR},
-      remarks = #{remarks,jdbcType=VARCHAR},
-      status = #{status,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-
-	<select id="selectOrganizationList" parameterType="String" resultType="com.goafanti.organization.bo.OrganizationListOut">
-		select
-			om.id,om.create_id as createId,om.create_time as createTime,
-			om.update_time as updateTime,om.deleted_sign as deletedSign,
-			om.name,om.type,
-			om.dep_no as depNo,
-			om.remarks,
-			om.status,
-			dm.name as superName,
-			wh.name as workingHoursName,
-			x.name as managerName
-		from department om
-		left join department dm on om.super_id = dm.id
-		left join admin x on om.manager_id = x.id
-		left join working_hours wh  on om.working_hours_type =wh.`type`
-		where 	om.deleted_sign = 0
-		<if test="name !=null">
-			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-		</if>
-		<if test="superId !=null">
-			AND om.super_id=#{superId,jdbcType=VARCHAR}
-		</if>
-		<if test="type !=null">
-			AND om.type=#{type,jdbcType=VARCHAR}
-		</if>
-		<if test="depNo !=null">
-			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
-		</if>
-		<if test="page_sql != null">
-    		${page_sql}
-   		</if>
-	</select>
-	<select id="selectOrganizationCount" resultType="java.lang.Integer">
-		select
-			count(0)
-		from department om
-		left join department dm on om.super_id = dm.id
-		left join admin x on om.manager_id = x.id
-		where om.deleted_sign = 0
-		<if test="name !=null">
-			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-		</if>
-		<if test="superId !=null">
-			AND om.super_id=#{superId,jdbcType=VARCHAR}
-		</if>
-		<if test="type !=null">
-			AND om.type=#{type,jdbcType=VARCHAR}
-		</if>
-		<if test="depNo !=null">
-			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
-		</if>
-	</select>
-	<select id="selectSuperId"  resultType="com.goafanti.organization.bo.OrganizationListOut">
-		select
-		id,name,dep_no as depNo
-		from department
-		where
-		status ='0'
-		order by CONVERT (name USING gbk)
-		<if test="sort ==1" >
-		limit 10
-		</if>
-	</select>
-	<insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
-		insert into department(
-		id,create_id,create_time,update_time,deleted_sign,
-		name,type,manager_id,dep_no,super_id,desc,status)
-		values(#{id,jdbcType=VARCHAR},#{createId,jdbcType=VARCHAR},
-		#{createTime,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},
-		#{deletedSign,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},
-		#{type,jdbcType=VARCHAR},#{managerId,jdbcType=VARCHAR},
-		#{depNo,jdbcType=VARCHAR},#{superId,jdbcType=VARCHAR},
-		#{desc,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})
-	</insert>
-	<!-- 得到上级 -->
-	<select id="selectDepNo" resultType="String">
-	select
-	dep_no as depNo
-		from department
-		where
-		id=#{superId,jdbcType=VARCHAR}
-	</select>
-
-	<select id="selectDepNoByName" resultType="String">
-		select
-		dep_no as depNo
-		from department
-		where
-		name=#{name,jdbcType=VARCHAR}
-	</select>
-	<select id="selectDepNoCount" parameterType="String" resultType="java.lang.Integer">
-		select
-		count(0)
-		from department
-		where
-		<!-- dep_no like concat(#{depNo,jdbcType=VARCHAR},'%') -->
-		super_id=#{superId,jdbcType=VARCHAR}
-	</select>
-	<select id="selectName" resultType="com.goafanti.admin.bo.AdminListBo">
-		select
-		name,id
-		from admin
-		where status='正常'
-		and name  like concat('%',#{name,jdbcType=VARCHAR},'%')
-	</select>
-	<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
-        select a.id, a.create_id as createId, a.create_time as createTime, a.update_time as updateTime,
-               a.deleted_sign as deletedSign, a.name, a.type, a.manager_id as managerId, a.dep_no as depNo,
-               a.super_id as superId, a.remarks, a.status, a.abbreviation, a.finance_id financeId,
-               a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName
-        from department a
-        left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id
-	where a.id=#{id,jdbcType=VARCHAR}
-	</select>
-	<delete id="deleteById" parameterType="java.lang.String">
-	    delete from department
-	    where id = #{id,jdbcType=VARCHAR}
-  	</delete>
-  	<select id="selectAdminNameById" parameterType="java.lang.String" resultType="java.lang.String">
-  		select
-  		name
-  		from admin
-  		where
-  		id=#{id,jdbcType=VARCHAR}
-  	</select>
-  	<select id="selectIdByDepNo" parameterType="java.lang.String" resultType="java.lang.String">
-  		select
-  		id
-  		from department
-  		where
-  		dep_no=#{depNo,jdbcType=VARCHAR}
-  	</select>
-  	<select id="selectIDNBySuperId" parameterType="java.lang.String" resultType="com.goafanti.organization.bo.OrganizationListOut">
-  		select
-  		id,create_id as createId,create_time as createTime,
-		update_time as updateTime,deleted_sign as deletedSign,
-		name,type,manager_id as managerId,
-		dep_no as depNo,
-		super_id as superId,
-		remarks,status
-  		from department
-  		where
-  		super_id=#{id,jdbcType=VARCHAR}
-  		order by dep_no
-  	</select>
-  	<update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">
-  		update department
-	    <set>
-	    	dep_no = #{depNo,jdbcType=VARCHAR}
-	    </set>
-	    where
-	    id=#{id,jdbcType=VARCHAR}
-  	</update>
-  	<select id="selectCountBySuperId" parameterType="String" resultType="java.lang.Integer">
-  		select
-		count(0)
-		from department
-		where
-		super_id=#{superId,jdbcType=VARCHAR}
-  	</select>
-  	<select id="selectIdByName" parameterType="java.lang.String" resultType="java.lang.String">
-  		select
-  		id
-  		from department
-  		where
-  		name=#{name,jdbcType=VARCHAR}
-  	</select>
-  	<select id="selectNameById" parameterType="java.lang.String" resultType="java.lang.String">
-  		select
-  		name
-  		from department
-  		where
-  		id=#{id,jdbcType=VARCHAR}
-  	</select>
-  	<select id="selectDepNoById" resultType="String">
-		select
-		dep_no as depNo
-		from department
-		where
-		id=#{id,jdbcType=VARCHAR}
-	</select>
-	<select id="selectUserById" parameterType="java.lang.String" resultType="java.lang.Integer">
-		select
-		count(0)
-		from admin
-		where
-		department_id=#{id,jdbcType=VARCHAR}
-	</select>
-	<!-- 查询当前层级 -->
-	<select id="selectCurrentDeps" parameterType="java.lang.String" resultMap="BaseResultMap">
-		select id,name,dep_no,super_id from department where manager_id = #{aid,jdbcType=VARCHAR}
-			union all
-		select id,name,dep_no,super_id from department where id = (select department_id from admin where id = #{aid,jdbcType=VARCHAR})
-	</select>
-	<!-- 查询下一层级  -->
-	<select id="selectSubDeps"  parameterType="java.lang.String" resultMap="BaseResultMap">
-		select id,name,dep_no from department where super_id in (#{superIds,jdbcType=VARCHAR})
-	</select>
-
-		<select id="selectBysuperId"  resultType="com.goafanti.admin.bo.depCountBo">
-		select a.id ,a.name ,0 userCount,0 inputCount,0 receiveCount, 0 completeCount, 0 interviewCount
-        from department a  where a.super_id= #{id}
-	</select>
-
-    <select id="selectBysuperName" resultType="com.goafanti.admin.bo.depCountBo">
-        select a.id ,a.name ,0 userCount,0 inputCount,0 receiveCount, 0 completeCount, 0 interviewCount
-        from department a left join department b on a.super_id=b.id where b.name= #{name}
-    </select>
-
-	<!-- 查询所有 -->
-	<select id="selectAllDeps" resultMap="BaseResultMap">
-		select id,name,dep_no from department
-	</select>
-	<select id="getMaxAbbreviation"  parameterType="java.lang.String" resultType="java.lang.String">
-	select max(contract_no) as maxNo from t_order_new
-	where create_time > '2019-5-31'
-	and contract_no like  concat(#{abbreviation,jdbcType=VARCHAR},'%')
-	</select>
-
-	<select id="getDepAll" resultType="com.goafanti.admin.bo.AdminCustomerBo">
-        select a.id aid,a.name aName,d.id depId,d.name depName,ifnull(b.userCount,0)userCount,ifnull(b.channelCount,0)channelCount,
-        ifnull(b.signCount,0)signCount,ifnull(b.newCount,0)newCount,ifnull(b.channelNewCount,0)channelNewCount,ifnull( b.receiveCount,0)receiveCount,
-        ifnull( b.completeCount,0)completeCount,ifnull(b.channelCompleteCount,0)channelCompleteCount
-        from admin a left join (select x.aid,x.userCount,x.channelCount,signCount,x.newCount,x.channelNewCount,x.receiveCount,
-        ifnull(y.completeCount,0)completeCount,ifnull(y.channelCompleteCount,0)channelCompleteCount
-        from (select aid,sum(if( share_type=0 and channel=0,1,0))userCount,
-        sum(if(share_type=3 and  channel=1,1,0))channelCount,
-        sum(if( share_type=2 ,1,0))signCount,
-        sum(if(share_type=0 and source =1  and channel=0,1,0))newCount,
-        sum(if(share_type=0 and source =1  and channel=1,1,0))channelNewCount,
-        sum(if(share_type=0 and source =2  and channel=0,1,0))receiveCount
-        from `user` where `type` =1 and new_channel=0
-        <if test="startTime != null and endTime != null">
-        and  transfer_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
-        </if>
-        group by aid)x left join (select a.aid,sum(if(b.channel=0,1,0))completeCount,
-        sum(if(b.channel=1,1,0))channelCompleteCount from public_release a left join `user` b on a.uid =b.id
-        where a.clock_in =1
-        <if test="startTime != null and endTime != null">
-        and clock_in_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
-        </if>
-        group by a.aid ) y on x.aid=y.aid)b on a.id=b.aid
-        left join department d on a.department_id=d.id
-        where  a.status='正常'  and a.type=1
-        <if test="adminName !=null">
-	and a.name  like concat('%',#{adminName},'%')
-	</if>
-	<if test="depId !=null">
-	and d.id= #{depId}
-	</if>
-	</select>
-    <select id="AlldepCount" resultType="com.goafanti.admin.bo.AdminCustomerBo">
-        select a.id aid,a.name aName ,a.department_id depId,c.name depName,ifnull(userCount,0)userCount,
-        ifnull(channelCount,0)channelCount,ifnull(signCount,0)signCount,ifnull(newCount,0)newCount,
-        ifnull(channelNewCount,0)channelNewCount,ifnull(receiveCount,0)receiveCount,ifnull(completeCount,0)completeCount,
-        ifnull(channelCompleteCount,0)channelCompleteCount
-        from admin a left join (select aid,sum(if( share_type=0 and channel=0,1,0))userCount,
-        sum(if(share_type=3 and  channel=1,1,0))channelCount,
-        sum(if( share_type=2 ,1,0))signCount,
-        sum(if(share_type=0 and source =1  and channel=0,1,0))newCount,
-        sum(if(share_type=0 and source =1  and channel=1,1,0))channelNewCount,
-        sum(if(share_type=0 and source =2  and channel=0,1,0))receiveCount
-        from `user` where `type` =1 and new_channel=0
-            <if test="startTime != null and endTime != null">
-                and  transfer_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
-            </if>
-            group by aid)b on a.id=b.aid
-        left join (select a.aid,sum(if(b.channel=0,1,0))completeCount,
-        sum(if(b.channel=1,1,0))channelCompleteCount from public_release a left join `user` b on a.uid =b.id
-        where a.clock_in =1
-        <if test="startTime != null and endTime != null">
-            and clock_in_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
-        </if>
-        group by a.aid ) y on a.id=y.aid
-                     left join department c on a.department_id =c.id
-        where  a.status='正常'  and a.type=1
-        <if test="depIds!= null">
-            and a.department_id in
-            <foreach close=")" collection="depIds" item="deps" open="(" separator=",">
-                #{deps.id}
-            </foreach>
-        </if>
-    </select>
-
-</mapper>

+ 0 - 332
src/main/java/com/goafanti/common/model/OrganizationManagement.java

@@ -1,332 +0,0 @@
-package com.goafanti.common.model;
-
-import java.util.Date;
-
-public class OrganizationManagement {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.create_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String createId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.create_time
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.update_time
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private Date updateTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.deleted_sign
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String deletedSign;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.name
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String name;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.type
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String type;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.manager_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String managerId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.dep_no
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String depNo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.super_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String superId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.remarks
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String remarks;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.status
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	private String status;
-	/**
-	 * 缩写
-	 */
-	private String abbreviation;
-	
-	/**
-	 * 负责财务id
-	 */
-	private String financeId;
-	
-	
-	/**
-	 * 	省份
-	 */
-	private Integer province;
-	
-	private Integer workingHoursType;
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.id
-	 * @return  the value of organization_management.id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.id
-	 * @param id  the value for organization_management.id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.create_id
-	 * @return  the value of organization_management.create_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getCreateId() {
-		return createId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.create_id
-	 * @param createId  the value for organization_management.create_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setCreateId(String createId) {
-		this.createId = createId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.create_time
-	 * @return  the value of organization_management.create_time
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.create_time
-	 * @param createTime  the value for organization_management.create_time
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.update_time
-	 * @return  the value of organization_management.update_time
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.update_time
-	 * @param updateTime  the value for organization_management.update_time
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.deleted_sign
-	 * @return  the value of organization_management.deleted_sign
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getDeletedSign() {
-		return deletedSign;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.deleted_sign
-	 * @param deletedSign  the value for organization_management.deleted_sign
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setDeletedSign(String deletedSign) {
-		this.deletedSign = deletedSign;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.name
-	 * @return  the value of organization_management.name
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.name
-	 * @param name  the value for organization_management.name
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.type
-	 * @return  the value of organization_management.type
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.type
-	 * @param type  the value for organization_management.type
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.manager_id
-	 * @return  the value of organization_management.manager_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getManagerId() {
-		return managerId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.manager_id
-	 * @param managerId  the value for organization_management.manager_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setManagerId(String managerId) {
-		this.managerId = managerId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.dep_no
-	 * @return  the value of organization_management.dep_no
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getDepNo() {
-		return depNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.dep_no
-	 * @param depNo  the value for organization_management.dep_no
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setDepNo(String depNo) {
-		this.depNo = depNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.super_id
-	 * @return  the value of organization_management.super_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getSuperId() {
-		return superId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.super_id
-	 * @param superId  the value for organization_management.super_id
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setSuperId(String superId) {
-		this.superId = superId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.remarks
-	 * @return  the value of organization_management.remarks
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.remarks
-	 * @param remarks  the value for organization_management.remarks
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.status
-	 * @return  the value of organization_management.status
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public String getStatus() {
-		return status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.status
-	 * @param status  the value for organization_management.status
-	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
-	 */
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public String getAbbreviation() {
-		return abbreviation;
-	}
-
-	public void setAbbreviation(String abbreviation) {
-		this.abbreviation = abbreviation;
-	}
-
-	public String getFinanceId() {
-		return financeId;
-	}
-
-	public void setFinanceId(String financeId) {
-		this.financeId = financeId;
-	}
-
-	public Integer getProvince() {
-		return province;
-	}
-
-	public void setProvince(Integer province) {
-		this.province = province;
-	}
-
-	public Integer getWorkingHoursType() {
-		return workingHoursType;
-	}
-
-	public void setWorkingHoursType(Integer workingHoursType) {
-		this.workingHoursType = workingHoursType;
-	}
-}

+ 2 - 9
src/main/java/com/goafanti/order/service/OrderService.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.List;
 
-import com.goafanti.common.model.OrganizationManagement;
+import com.goafanti.common.model.Department;
 import com.goafanti.common.model.TOrderDetail;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.customer.bo.FollowBusinessBo;
@@ -115,8 +115,6 @@ public interface OrderService {
 	 * @param endDate 结束时间
 	 * @param intention 是否包含意向
 	 * @param formal 是否包含正式
-	 * @param depId 部门id
-	 * @param history 是否包含历史
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
@@ -136,8 +134,6 @@ public interface OrderService {
 	/**
 	 * 更新订单
 	 * @param orderNo
-	 * @param firstPayment
-	 * @param orderAmount
 	 * @param signFirstPayment
 	 * @param signTotalAmount
 	 * @param orderRemarks
@@ -149,8 +145,6 @@ public interface OrderService {
 	/**
 	 * 签单
 	 * @param orderNo
-	 * @param firstPayment
-	 * @param orderAmount
 	 * @param signFirstPayment
 	 * @param signTotalAmount
 	 * @param approval
@@ -184,7 +178,6 @@ public interface OrderService {
 	/**
 	 * 修改商品信息
 	 * @param detailId
-	 * @param orderNo
 	 * @param discountPrice
 	 * @param discountFirstPayment
 	 * @param remarks
@@ -203,7 +196,7 @@ public interface OrderService {
 	 * 查询分管部门、查询管理部门
 	 * @return
 	 */
-	List<OrganizationManagement> selectMyDeps();
+	List<Department> selectMyDeps();
 
 	/**
 	 *

+ 3 - 13
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.UUID;
 
 
+import com.goafanti.common.dao.*;
 import com.goafanti.order.bo.TOrderTaskBo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,16 +21,6 @@ import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.TOrderBackMapper;
-import com.goafanti.common.dao.TOrderBillNewMapper;
-import com.goafanti.common.dao.TOrderBonusMapper;
-import com.goafanti.common.dao.TOrderLogMapper;
-import com.goafanti.common.dao.TOrderMonthReportMapper;
-import com.goafanti.common.dao.TOrderNewMapper;
-import com.goafanti.common.dao.TOrderRefundMapper;
-import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
@@ -40,7 +31,6 @@ import com.goafanti.common.model.TOrderBonus;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderRefund;
-import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
@@ -82,7 +72,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Autowired
 	private OrderNewService orderNewService;
 	@Autowired
-	private OrganizationManagementMapper	organizationManagementMapper;
+	private DepartmentMapper departmentMapper;
 	@Autowired
 	private AsyncUtils	asyncUtils;
 
@@ -497,7 +487,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			}
 		}else {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
-			OrganizationListOut oo=organizationManagementMapper.selectAllById(new1.getOrderDep());
+			OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
 			t.setFinanceId(oo.getFinanceId());
 			for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
 				aids.add(admin.getId());

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -78,7 +78,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderRefundInvoiceMapper	orderRefundInvoiceMapper;
 	@Autowired
-	private OrganizationManagementMapper	organizationManagementMapper;
+	private DepartmentMapper	departmentMapper;
 	@Autowired
 	private NewOrderRefundMapper	newOrderRefundMapper;
 	@Autowired

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -34,7 +34,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	@Autowired
 	private TOrderNewMapper		tOrderNewMapper;
 	@Autowired
-	private OrganizationManagementMapper	organizationManagementMapper;
+	private DepartmentMapper	departmentMapper;
 	@Autowired
 	private AdminMapper	adminMapper;
 	@Autowired
@@ -84,7 +84,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
 			if (o.getType()==0) {//省内
 				if(o.getApproval()==0) {
-					aids.add(organizationManagementMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
+					aids.add(departmentMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
 				}else {
 					for (Admin admin : adminMapper.getAdminRoleList("湖南特批开票")) {
 						aids.add(admin.getId());
@@ -264,7 +264,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			addInvoiceLog(id,3);
 			type= NoticeStatus.ORDER_INVPICE_APPROVA_YES.getCode();
 			if (o.getType()==0) {
-				aids.add(organizationManagementMapper.selectByPrimaryKey(ts.getOrderDep()).getFinanceId());
+				aids.add(departmentMapper.selectByPrimaryKey(ts.getOrderDep()).getFinanceId());
 			}else if(o.getType()==1) {
 				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), "营销管理员"));
 			}

+ 6 - 6
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -82,7 +82,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
-	private OrganizationManagementMapper 	organizationManagementMapper ;
+	private DepartmentMapper 	departmentMapper ;
 	@Autowired
 	private JDBCIdGenerator	idGenerator;
 	@Autowired
@@ -476,7 +476,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 */
 	private void createContractNo(TOrderNew t) {
 		//根据订单部门或许合同编号前缀
-		OrganizationManagement dep=organizationManagementMapper.selectByPrimaryKey(t.getOrderDep());
+		Department dep=departmentMapper.selectByPrimaryKey(t.getOrderDep());
 		//获取日期年份
 		Calendar c=Calendar.getInstance();
 		int y=c.get(Calendar.YEAR);
@@ -489,7 +489,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			idleContractNoMapper.deleteByPrimaryKey(i.getId());
 		}else {
 			//根据前缀查询最大编号
-			String max=organizationManagementMapper.getMaxAbbreviation(dep.getAbbreviation()+"-");
+			String max=departmentMapper.getMaxAbbreviation(dep.getAbbreviation()+"-");
 
 			String sno=null;
 			if (StringUtils.isBlank(max)||max.length()<13) {
@@ -792,7 +792,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				if(outsource==0) {
 					t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 					//如果是转的暂时不删除外包信息
-					aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
+					aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 				} else if(outsource==1) {
 					for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
 						aids.add(admin.getId());
@@ -1132,7 +1132,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (confirm==2) {
 			t.setApproval(2);
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
-				OrganizationListOut oo=organizationManagementMapper.selectAllById(t2.getOrderDep());
+				OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
 				t.setFinanceId(oo.getFinanceId());
 				for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
 					aids.add(admin.getId());
@@ -1244,7 +1244,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			i.setYear(y);
 			//如果找不到订单部门,则取订单编号-前面的缩写
 			if(StringUtils.isNotBlank(orderDep)) {
-				OrganizationManagement o=organizationManagementMapper.selectByPrimaryKey(orderDep);
+				Department o=departmentMapper.selectByPrimaryKey(orderDep);
 				i.setAbbreviation(o.getAbbreviation());
 			}else {
 				i.setAbbreviation(contractNo.substring(0, contractNo.indexOf("-")));

+ 123 - 158
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -13,6 +13,9 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import com.goafanti.common.dao.*;
+import com.goafanti.common.model.*;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,46 +26,12 @@ import org.springframework.transaction.annotation.Transactional;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.BusinessProjectMapper;
-import com.goafanti.common.dao.ContractMapper;
-import com.goafanti.common.dao.ContractTaskLogMapper;
-import com.goafanti.common.dao.ContractTaskMapper;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.TOrderBillMapper;
-import com.goafanti.common.dao.TOrderChangeMapper;
-import com.goafanti.common.dao.TOrderDetailMapper;
-import com.goafanti.common.dao.TOrderMapper;
-import com.goafanti.common.dao.TmpTableMapper;
-import com.goafanti.common.dao.UserBusinessMapper;
-import com.goafanti.common.dao.UserFollowBusinessMapper;
-import com.goafanti.common.dao.UserFollowMapper;
-import com.goafanti.common.dao.UserLockReleaseMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderFlowState;
 import com.goafanti.common.enums.UserLockReleaseStatus;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Contract;
-import com.goafanti.common.model.ContractTask;
-import com.goafanti.common.model.ContractTaskLog;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrganizationManagement;
-import com.goafanti.common.model.TOrder;
-import com.goafanti.common.model.TOrderBill;
-import com.goafanti.common.model.TOrderChange;
-import com.goafanti.common.model.TOrderDetail;
-import com.goafanti.common.model.TmpTable;
-import com.goafanti.common.model.User;
-import com.goafanti.common.model.UserBusiness;
-import com.goafanti.common.model.UserFollow;
-import com.goafanti.common.model.UserFollowBusiness;
-import com.goafanti.common.model.UserLockRelease;
-import com.goafanti.common.model.UserRole;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.DateUtils;
@@ -115,10 +84,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@Autowired
 	private TOrderBillMapper tOrderBillMapper;
 	@Autowired
-	private OrganizationManagementMapper organizationManagementMapper;
+	private DepartmentMapper departmentMapper;
 	@Autowired
 	private ContractMapper contractMapper;
-	@Autowired 
+	@Autowired
 	private ContractTaskMapper contractTaskMapper;
 	@Autowired
 	private TOrderChangeMapper tOrderChangeMapper;
@@ -142,16 +111,16 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private UserFollowMapper	userFollowMapper;
 	@Autowired
 	private UserFollowBusinessMapper	userFollowBusinessMapper;
-	
+
 	@Value(value = "${mobileRemindCodeTemplate}")
 	private String					mobileRemindCodeTemplate	= null;
-	
+
 	@Value(value = "${accessKey}")
 	private String					accessKey			= null;
 
 	@Value(value = "${accessSecret}")
 	private String					accessSecret		= null;
-	
+
 	private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);//默认首付价格
 	private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);//默认单价
 	private final String DEFAULT_PLATFORM_ID = "0"; //平台默认id
@@ -160,7 +129,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
 	private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
 	private final String DEFUALT_SET_UP_COMMENT = "系统自动生产立项信息,请自行修改或补充";
-	
+
 	/*
 	 * -------------------------------------------------- APP管理端 --------------------------------------------------------
 	 */
@@ -177,9 +146,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				bo.setCommodityPrice("面议");
 			else
 				bo.setCommodityPrice(bo.getCommodityPrice()+" 万");
-			if(StringUtils.isBlank(bo.getFirstPayment())) 
+			if(StringUtils.isBlank(bo.getFirstPayment()))
 				bo.setFirstPayment("面议");
-			else 
+			else
 				bo.setFirstPayment(bo.getFirstPayment()+" 万");
 		} catch (IllegalAccessException | InvocationTargetException e) {
 			e.printStackTrace();
@@ -192,17 +161,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	 * 后期规则:自营服务订单 、需求订单、其他订单不能同时加入购物车
 	 */
 	@Override
-	public int addIntention(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType, 
+	public int addIntention(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
 			String createTime,String remarks) throws ParseException {
 		CommodityDetailBo bo =  tOrderMapper.selectCommodityDetail(commodityId,commodityType);
-		BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE 
+		BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE
 				: new BigDecimal(Double.valueOf(bo.getCommodityPrice()));
-		BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT 
+		BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT
 				: new BigDecimal(Double.valueOf(bo.getCommodityFirstPayment()));
 		BigDecimal discountPrice = commodityPrice.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
 		BigDecimal discountFirstPayment = commodityFirstPayment.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
 		TOrder tOrder = new TOrder();
-		tOrder.setOrderNo(orderNo);	
+		tOrder.setOrderNo(orderNo);
 		tOrder.setCreater(DEFAULT_ADMIN_ID);
 		tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
 		if(commodityType == CommodityType.DEMAND.getTypeCode()){
@@ -228,7 +197,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setOrderRemarks(remarks);
 		tOrder.setContractType(bo.getCommodityClassify());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
-		
+
 		TOrderDetail tOrderDetail = new TOrderDetail();
 		tOrderDetail.setId(UUID.randomUUID().toString());
 		tOrderDetail.setOrderNo(orderNo);
@@ -246,7 +215,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrderMapper.insert(tOrder);
 		return 1;
 	}
-	
+
 	/**
 	 * 订单状态流转
 	 * @param orderAction
@@ -320,15 +289,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
 				tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
 			}
-		}else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请 
-			if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode() 
+		}else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请
+			if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
 					|| tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()
 					|| tOrder.getActuallyTotalAmount().doubleValue() <= 0){
 				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"等待提现"));
 			}
 			tOrder.setLiquidationStatus(LiquidationState.WAIT_FOR_WITHDRAW.getCode());
 		}else if(orderAction == OrderAction.CONFIRM_WITHDRAW){ //提现确认 (审核员先审核流水)
-			if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode() 
+			if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
 					|| tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_WITHDRAW.getCode()
 					|| tOrder.getActuallyTotalAmount().doubleValue() <= 0){
 				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认提现"));
@@ -348,7 +317,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}
 			if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"取消订单"));
 			if(TokenManager.getToken() instanceof Admin){
-				if(!tOrder.getSellerId().equals(DEFAULT_PLATFORM_ID)) 
+				if(!tOrder.getSellerId().equals(DEFAULT_PLATFORM_ID))
 					throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"取消订单"));
 				if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode())
 					tOrder.setOrderStatus(OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode());
@@ -366,7 +335,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					if( tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
 						tOrder.setOrderStatus(OrderState.BUYER_CANCEL_AFTER_SIGN.getCode());
 				}
-			}		
+			}
 		}else if(orderAction == OrderAction.APPLY_FOR_REFUND){ //退款申请
 			boolean	flag = true;
 			if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
@@ -375,7 +344,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 				flag = false;
 			}
-			if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund 
+			if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
 			if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
 					|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
 					|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
@@ -394,18 +363,18 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 				flag = false;
 			}
-			if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund 
+			if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
 			if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
 				flag = false;
 			if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
 				flag = false;
 			if(confrim) {
-				if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"同意退款")); 
+				if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"同意退款"));
 				tOrder.setLiquidationStatus(LiquidationState.AGREE_REFUND.getCode());
 			}else{
 				if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"拒绝退款"));
 				tOrder.setLiquidationStatus(LiquidationState.REFUSE_REFUND.getCode());
-			}	
+			}
 		}else if(orderAction == OrderAction.COMPLETE_REFUND){ //完成退款
 			boolean flag = true;
 			if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
@@ -414,7 +383,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 				flag = false;
 			}
-			if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund 
+			if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
 			if(tOrder.getLiquidationStatus() != LiquidationState.AGREE_REFUND.getCode())
 				flag = false;
 			if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
@@ -431,8 +400,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}
 		}
 	}
-	
-	
+
+
 	/**
 	 * 设置按钮状态
 	 * @param tOrder
@@ -440,7 +409,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	 */
 	private OperatorActive setOperatorActive(TOrder tOrder){
 		OperatorActive active = new OperatorActive();
-		if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode()) 
+		if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode())
 			return active;
 		if(tOrder.getDeleteSign() == ActiveState.LOCKING.getCode()) {
 			active.setApplyUnLock(true);
@@ -460,10 +429,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
 					/** 需求订单 开始 **/
 					if (tOrder.getOrderType() == CommodityType.DEMAND.getTypeCode()) {
-						active.setConfirmIntention(true); 
-						active.setRefuseIntention(true); 
+						active.setConfirmIntention(true);
+						active.setRefuseIntention(true);
 					} else {
-						active.setConfirmIntention(false); 
+						active.setConfirmIntention(false);
 						active.setRefuseIntention(false);
 					}
 					/** 需求订单 结束 **/
@@ -509,7 +478,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				}
 				if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
 					flag = false;
-				active.setApplyForRefund(flag); //申请退款		
+				active.setApplyForRefund(flag); //申请退款
 			}else if(TokenManager.getUserId().equals(tOrder.getSellerId())){ //卖方
 				active.setPayForFirst(false);
 				active.setPayForLast(false);
@@ -517,16 +486,16 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
 					/** 需求订单 开始 **/
 					if (tOrder.getOrderType() == CommodityType.DEMAND.getTypeCode()) {
-						active.setConfirmIntention(false); 
-						active.setRefuseIntention(false); 
+						active.setConfirmIntention(false);
+						active.setRefuseIntention(false);
 					} else {
-						active.setConfirmIntention(true); 
-						active.setRefuseIntention(true); 
+						active.setConfirmIntention(true);
+						active.setRefuseIntention(true);
 					}
 					/** 需求订单 结束 **/
 				} else {
-					active.setConfirmIntention(false); 
-					active.setRefuseIntention(false); 
+					active.setConfirmIntention(false);
+					active.setRefuseIntention(false);
 				}
 				boolean flag = true;
 				if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
@@ -551,7 +520,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					flag = false;
 				active.setAgreeRefund(flag); //同意退款
 				active.setRefuseRefund(flag); //拒绝退款
-				if (tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode() 
+				if (tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode()
 						&& tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode()
 						&& tOrder.getActuallyTotalAmount().doubleValue() > 0) {
 					active.setApplyForWithdraw(true); //申请提现
@@ -586,7 +555,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				boolean flag = true;
 				if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
 					flag = false;
-				}			
+				}
 				if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
 						&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
 						&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
@@ -612,7 +581,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				active.setApplyForCancel(false); //申请取消
 				active.setAgreeRefund(false); //同意退款
 				active.setRefuseRefund(false); //拒绝退款
-			}	
+			}
 		}
 		//平台方作为中间方 确认首付 - 尾款 - 提现 - 退款
 		if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
@@ -640,7 +609,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 			flag = false;
 		}
-		if(flag && tOrder.getActuallyTotalAmount().doubleValue() == 0 
+		if(flag && tOrder.getActuallyTotalAmount().doubleValue() == 0
 				&& tOrder.getDeleteSign() == DeleteStatus.UNDELETE.getCode()){
 			active.setApplyRevoke(true); //作废
 		}else{
@@ -679,7 +648,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	 * @param transactionSubject 交易科目
 	 * @param payChannel 支付渠道
 	 * @param transactionMode 支付方式
-	 * @param FundAudit 流水审核
 	 * @return
 	 */
 	public int addFundRecord(String orderNo,String creater,String payeeId,String payerId,String remarks,TransactionSubject transactionSubject,PayChannel payChannel,
@@ -701,11 +669,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		bill.setCreateTime(new Date());
 		return tOrderBillMapper.insert(bill);
 	}
-	
+
 	@Override
 	public int updatePayForFirst(String orderNo, BigDecimal fundAmount,String remarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
-		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
+		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
 				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 		tOrder.setUpdateTime(new Date());
 		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
@@ -714,7 +682,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@Override
 	public int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
-		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
+		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
 				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 		tOrder.setUpdateTime(new Date());
 		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
@@ -730,7 +698,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		Pagination<TOrder> data = (Pagination<TOrder>)findPage("selectOrderListByPage", "selectOrderListCount", params, pageNo, pageSize);
 		List<TOrder> list = (List<TOrder>)data.getList();
 		C2BOrderDetailBo bo = null;
-		List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>(); 
+		List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>();
 		List<CommodityDetailBo> commoditys = null;
 		CommodityDetailBo cdb = null;
 		if(list.size()>0){
@@ -838,11 +806,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	/**
-	 * 
+	 *
 	 * @param transactionSubject 交易科目
 	 * @param transactionAmount 交易金额
-	 * @param payeeId 收款人
-	 * @param payerId 付款人
 	 * @return
 	 */
 	private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
@@ -879,7 +845,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else if(0 == intention && 0 == formal){
 			return new Pagination<OrderListBo>();
 		}
-		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount", 
+		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
 				params, pageNo, pageSize);
 		TOrder tOrder = null;
 		List<OrderListBo> list = (List<OrderListBo>)data.getList();
@@ -896,7 +862,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		data.setList(list);
 		return data;
 	}
-	
+
 	private Map<String,Object> disposeParams(OrderListBo bo,String startDate,String endDate){
 		Map<String,Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
@@ -909,7 +875,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(bo.getLiquidationStatus() != null) params.put("liquidationStatus", bo.getLiquidationStatus());
 		if(bo.getProjectStage() != null) params.put("projectStage", bo.getProjectStage());
 		if(bo.getOrderChannel() != null) params.put("orderChannel", bo.getOrderChannel());
-		
+
 		return params;
 	}
 
@@ -963,7 +929,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
 					tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
 			}
-			
+
 		}
 		if (flag && !flag2) { //只有待签单或者变更中可修改
 			throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
@@ -1030,9 +996,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
 	}
-	
+
 	public void checkOrder(TOrder tOrder){
-		if(tOrder == null) 
+		if(tOrder == null)
 			 throw new BusinessException(new Error(ErrorConstants.ORDER_NOT_EXIST, "" ,""));
 		if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode())
 			 throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_FREEZE, tOrder.getOrderNo(),""));
@@ -1062,7 +1028,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					if(bo.getAid().equals(TokenManager.getAdminId())){
 						isBusinessOwner = true;
 						releaseList.add(bo);
-					} 
+					}
 				}
 				if(!isBusinessOwner) throw new BusinessException(new Error(ErrorConstants.BUSINESS_ALREADY_LOCKED,businessName,""));
 			}else{
@@ -1071,14 +1037,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		return releaseList;
 	}
-	
+
 	private void lockProject(BusinessListBo ub) {
 		UserLockRelease ulr= new UserLockRelease();
 			ulr.setId(UUID.randomUUID().toString());
 			ulr.setType(1);
 			ulr.setAid(TokenManager.getAdminId());
 			ulr.setBusinessProjectId(ub.getBusinessProjectId());
-			SimpleDateFormat sdf =   new SimpleDateFormat( " yyyy-MM-dd HH:mm:ss " ); 
+			SimpleDateFormat sdf =   new SimpleDateFormat( " yyyy-MM-dd HH:mm:ss " );
 			try {
 				if (null==ub.getCreateTime()) {
 					ulr.setLockTime(new Date());
@@ -1092,7 +1058,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			ulr.setUid(ub.getUid());
 			userLockReleaseMapper.insert(ulr);
 		}
-	
+
 	@SuppressWarnings("unused")
 	private void releaseProject(List<LockingReleaseBo> releaseList){
 		if(releaseList != null && releaseList.size()>0){
@@ -1103,17 +1069,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				ulr.setStatus(UserLockReleaseStatus.RELEASE.getCode());
 				userLockReleaseMapper.updateByPrimaryKeySelective(ulr);
 			}
-			
+
 		}
 	}
-	
+
 	@Override
 	@Transactional
 	public int addOrderCommodity(String orderNo, String commodityId,String commodityName, String commodityMode, Integer commodityQuantity,Integer commodityType,
 			String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks) {
 			TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 			checkOrder(tOrder);
-			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode() 
+			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
 					&& tOrder.getChangeStatus() != ChangeState.CHANGING.getCode()){
 				 throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo,""));
 			}else{
@@ -1129,7 +1095,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				detail.setDiscountPrice(new BigDecimal(discountPrice));
 				detail.setCommodityFirstPayment(new BigDecimal(commodityFirstPayment));
 				detail.setDiscountFirstPayment(new BigDecimal(discountFirstPayment));
-				detail.setRemarks(remarks);	
+				detail.setRemarks(remarks);
 				detail.setCreateTime(new Date());
 				tOrderDetailMapper.insert(detail);
 				//订单市场价总额
@@ -1223,34 +1189,34 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		return 1;
 	}
-	
+
 	@Override
-	public List<OrganizationManagement> selectMyDeps(){
-		if(TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) 
-			return organizationManagementMapper.selectAllDeps();
+	public List<Department> selectMyDeps(){
+		if(TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))
+			return departmentMapper.selectAllDeps();
 		else
 			return selectCurrentDep(TokenManager.getAdminId());
 	}
-	
-	private List<OrganizationManagement> selectSubDeps(List<OrganizationManagement> allData,List<OrganizationManagement> superData){
-		List<OrganizationManagement> subData = new ArrayList<>();
+
+	private List<Department> selectSubDeps(List<Department> allData,List<Department> superData){
+		List<Department> subData = new ArrayList<>();
 		String superIds = "";
-		for(OrganizationManagement om : superData){
+		for(Department om : superData){
 			if(!om.getId().equals(om.getSuperId())){
 				superIds += om.getId() + ",";
 			}
 		}
-		if(StringUtils.isNotBlank(superIds)) subData = organizationManagementMapper.selectSubDeps(superIds.substring(0, superIds.length()-1));
+		if(StringUtils.isNotBlank(superIds)) subData = departmentMapper.selectSubDeps(superIds.substring(0, superIds.length()-1));
 		if(subData != null && subData.size()>0) {
 			allData.addAll(subData);
 			selectSubDeps(allData,subData);
-		} 
+		}
 		return allData;
-	} 
-	
-	private List<OrganizationManagement> selectCurrentDep(String managerId){
-		List<OrganizationManagement> allData = new ArrayList<OrganizationManagement>();
-		List<OrganizationManagement> superData = organizationManagementMapper.selectCurrentDeps(managerId);
+	}
+
+	private List<Department> selectCurrentDep(String managerId){
+		List<Department> allData = new ArrayList<Department>();
+		List<Department> superData = departmentMapper.selectCurrentDeps(managerId);
 		if(superData != null && superData.size()>0){
 			allData.addAll(superData);
 		}
@@ -1269,7 +1235,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}else{
 				if(!depIds.contains(",")) params.put("depIds","'" + depIds + "'");
 			}
-				
+
 		}else{
 			if(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))
 				return new Pagination<OrderListBo>();
@@ -1280,7 +1246,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}else if(0 == intention && 0 == formal){
 			return new Pagination<OrderListBo>();
 		}
-		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount", 
+		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
 				params, pageNo, pageSize);
 		TOrder tOrder = null;
 		List<OrderListBo> list = (List<OrderListBo>)data.getList();
@@ -1319,7 +1285,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
 		params.put("deleteStatus", 1);
-		return  (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount", 
+		return  (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
 				params, pageNo, pageSize);
 	}
 
@@ -1335,7 +1301,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(bo.getOrderStatus() != null) params.put("orderStatus", bo.getOrderStatus());
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
-		return (Pagination<OrderListBo>)findPage("selectPublicOrderByPage","selectPublicOrderCount", 
+		return (Pagination<OrderListBo>)findPage("selectPublicOrderByPage","selectPublicOrderCount",
 				params, pageNo, pageSize);
 	}
 
@@ -1350,7 +1316,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,  
+	public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
 			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
 			String startDate,String endDate,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -1389,8 +1355,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		/** 特殊处理字段结束 **/
 		return (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
 	}
-	
-	
+
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<BillListBo> queryMyBillList(String payeeName, String payerName, String depId,
@@ -1411,7 +1377,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		/** 特殊处理字段结束 **/
 		return (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<BillListBo> queryAllBillList(String payeeName, String payerName, String depId,
@@ -1463,7 +1429,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				checkOrder(order);
 				if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
 						&& bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode())	{ //代付+首付状态
-					setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false); 
+					setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
 					tOrderMapper.updateByPrimaryKeySelective(order);
 					//如果支付后订单符合待立项,系统自动立项 2018-4-10
 					if(order.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
@@ -1481,7 +1447,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					tOrderMapper.updateByPrimaryKeySelective(order);
 				}else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode()
 						&& bill.getTransactionSubject() == TransactionSubject.SUPPLY_COLLECT.getCode()) { //代收+提现状态
-					setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false); 
+					setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
 					tOrderMapper.updateByPrimaryKeySelective(order);
 				} else {
 					throw new BusinessException(new Error(ErrorConstants.BILL_ALREADY_EXPIRE, billNo , ""));
@@ -1561,7 +1527,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			String userName=tOrderMapper.selectByUserName(tOrder.getOrderNo());
 			//String message=noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",变更内容:"+noticeComment+",操作人-" + TokenManager.getAdminToken().getName();
-			String paramString = "{\"number\":\"" + tOrder.getOrderNo() 
+			String paramString = "{\"number\":\"" + tOrder.getOrderNo()
 			+ "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
 			+ "\",\"name\":\"" +  userName
 			+ "\",\"time\":\"" +   sdf.format(new Date())
@@ -1569,7 +1535,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			"\"}";
 			MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
 	}
-	
+
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -1586,7 +1552,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			params.put("depId", depId);
 		if(approval != null)
 			params.put("approval", approval);
-		return  (Pagination<OrderListBo>)findPage("selectSetUpServiceOrderByPage","selectSetUpServiceOrderCount", 
+		return  (Pagination<OrderListBo>)findPage("selectSetUpServiceOrderByPage","selectSetUpServiceOrderCount",
 				params, pageNo, pageSize);
 	}
 
@@ -1600,12 +1566,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode()){
 			if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
 				flag = true;
-			if(tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode()) 
+			if(tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode())
 				flag = true;
 			if(tOrder.getApproval() == ApprovalState.AUDIT_PASS.getCode())
 				flag = true;
-		}	
-		if(!flag) 
+		}
+		if(!flag)
 			throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
 		tOrder.setProjectStage(ProjectStage.ALREADY_SET_UP.getCode());
 		tOrder.setOrderStage(OrderStage.PROJECT.getCode());
@@ -1673,7 +1639,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
 				|| tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
-			addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "", 
+			addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
 					TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, new BigDecimal(payAmount), TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 			tOrder.setUpdateTime(new Date());
 			tOrderMapper.updateByPrimaryKeySelective(tOrder);
@@ -1687,7 +1653,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	public int updateRefundForTest(String orderNo, String refundAmount) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		if(tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()){
-			addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "", 
+			addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
 					TransactionSubject.REFUND,PayChannel.UNIONPAY, new BigDecimal(refundAmount).multiply(new BigDecimal(-1)), TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 			tOrder.setUpdateTime(new Date());
 			tOrderMapper.updateByPrimaryKeySelective(tOrder);
@@ -1696,7 +1662,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		return 1;
 	}
-	
+
 	@Override
 	public int updateDistributionOrder(String orderNo, String financeId) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
@@ -1736,7 +1702,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				boolean flag = true;
 				if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
 					flag = false;
-				}			
+				}
 				if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
 						&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
 						&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
@@ -1750,8 +1716,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		return 1;
 	}
-	
-	
+
+
 	private String getSalesmanIdByUid(String uid){
 		User u = userMapper.selectByPrimaryKey(uid);
 		if(u!=null&&StringUtils.isBlank(u.getAid())){
@@ -1780,7 +1746,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		setOrderState(OrderAction.CONFIRM_REFUND, new BigDecimal(0), tOrder, confirm);
 		tOrder.setUpdateTime(new Date());
 		if(confirm){ //同意退款生成退款流水
-			BigDecimal transactionAmount = tOrder.getActuallyTotalAmount().subtract(tOrder.getActuallyBrokerageAmount()).multiply(new BigDecimal(-1)); 
+			BigDecimal transactionAmount = tOrder.getActuallyTotalAmount().subtract(tOrder.getActuallyBrokerageAmount()).multiply(new BigDecimal(-1));
 			addFundRecord(orderNo, "平台方", DEFAULT_PLATFORM_ID,TokenManager.getUserId(), "同意退款系统生成流水",
 					TransactionSubject.REFUND, PayChannel.UNIONPAY,transactionAmount,TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 		}
@@ -1797,25 +1763,25 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setUpdateTime(new Date());
 		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
 	}
-	
+
 	/**
 	 * PC端添加意向
 	 * 只能购买一份
 	 * 后期规则:自营服务订单 、需求订单、其他订单不能同时加入购物车
-	 * @throws ParseException 
+	 * @throws ParseException
 	 */
 	@Override
-	public int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType, 
+	public int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
 			String createTime,String remarks) throws ParseException {
 		CommodityDetailBo bo =  tOrderMapper.selectCommodityDetail(commodityId,commodityType);
-		BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE 
+		BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE
 				: new BigDecimal(Double.valueOf(bo.getCommodityPrice()));
-		BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT 
+		BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT
 				: new BigDecimal(Double.valueOf(bo.getCommodityFirstPayment()));
 		BigDecimal discountPrice = commodityPrice.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
 		BigDecimal discountFirstPayment = commodityFirstPayment.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
 		TOrder tOrder = new TOrder();
-		tOrder.setOrderNo(orderNo);	
+		tOrder.setOrderNo(orderNo);
 		tOrder.setCreater(DEFAULT_ADMIN_ID);
 		tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
 		if(commodityType == CommodityType.DEMAND.getTypeCode()){
@@ -1837,12 +1803,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
 		tOrder.setChangeStatus(ChangeState.UNCHANGE.getCode());
-		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));			
-		
+		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
+
 		tOrder.setOrderRemarks(remarks);
 		tOrder.setContractType(bo.getCommodityClassify());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
-		
+
 		TOrderDetail tOrderDetail = new TOrderDetail();
 		tOrderDetail.setId(UUID.randomUUID().toString());
 		tOrderDetail.setOrderNo(orderNo);
@@ -1893,10 +1859,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrderChangeMapper.updateByPrimaryKeySelective(change);
 		return updateOrderSatusByChange(change.getOrderNo());
 	}
-	
+
 	/**
 	 * 更新变更状态
-	 * @param changeId
 	 * @return
 	 */
 	private int updateOrderSatusByChange(String orderNo){
@@ -1930,7 +1895,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		List<TmpTable> tmpData = tmpTableMapper.selectAll();
 		int taskDistribution = TaskDistributionState.NOT_DISTRIBUTION.getCode();
 		for(TmpTable tt: tmpData){
-			if(tt.getAllCount() == tt.getDisCount()) 
+			if(tt.getAllCount() == tt.getDisCount())
 				taskDistribution = TaskDistributionState.ALL_DISTRIBUTION.getCode();
 			else if(tt.getAllCount() > tt.getDisCount() && tt.getDisCount() != 0)
 				taskDistribution = TaskDistributionState.PART_DISTRIBUTION.getCode();
@@ -1940,7 +1905,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		return 1;
 	}
-	
+
 	private void generatorNoticeData(NoticeStatus noticeType,String noticeComment,TOrder tOrder){
 		if(tOrder == null) return;
 		Notice notice = null;
@@ -1997,8 +1962,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 
 	private void MobileNotice(List<String> targetIds, TOrder tOrder) {
-		
-		
+
+
 	}
 
 	@Override
@@ -2023,10 +1988,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				c.setCreateTime(new Date());
 				contractTaskLogMapper.insert(c);
 			}
-				
+
 		}
-		
-		
+
+
 	}
 
 	@Override
@@ -2086,7 +2051,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					userBusiness.setUid(fbb.getUid());
 					userBusiness.setAid(TokenManager.getAdminId());
 					userBusiness.setRemarks(ub.getRemarks());
-					userBusinessMapper.insert(userBusiness);	
+					userBusinessMapper.insert(userBusiness);
 					//更新业务中间表
 					userFollowBusiness.setBusinessId(ubId);
 					userFollowBusiness.setCustomerStatus(ub.getCustomerStatus());
@@ -2097,12 +2062,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					userFollowBusiness.setBusinessProjectId(ub.getBusinessProjectId());
 					userFollowBusinessMapper.insert(userFollowBusiness);
 				}
-				
+
 			}
-		
-		
+
+
 		return 1;
 	}
 
-	
+
 }

+ 3 - 10
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -6,19 +6,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.common.dao.*;
 import com.goafanti.order.bo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.OutsourceLogMapper;
-import com.goafanti.common.dao.OutsourceOrganizationMapper;
-import com.goafanti.common.dao.TOrderLogMapper;
-import com.goafanti.common.dao.TOrderNewMapper;
-import com.goafanti.common.dao.TOrderOutsourceMapper;
-import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.model.Admin;
@@ -41,7 +34,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 	@Autowired
 	private OutsourceOrganizationMapper  outsourceOrganizationMapper;
 	@Autowired
-	private OrganizationManagementMapper	organizationManagementMapper;
+	private DepartmentMapper departmentMapper;
 	@Autowired
 	private TOrderOutsourceMapper	tOrderOutsourceMapper;
 	@Autowired
@@ -125,7 +118,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 				t.setOrderStatus(2);//订单审核标记通过
 				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 				addOrderLog(o.getOrderNo(),OrderLogProcess.WBTG.getCode(),o.getRemarks());
-				aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
+				aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 				type=NoticeStatus.ORDER_OUTSOURCE_YES.getCode();
 			}else {
 				t.setOrderStatus(1);

+ 10 - 10
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -2,6 +2,7 @@ package com.goafanti.organization.controller;
 
 import javax.annotation.Resource;
 
+import com.goafanti.common.dao.DepartmentMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -10,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
@@ -21,7 +21,7 @@ public class AdminOrganizationController extends BaseApiController{
 	@Resource
 	private OrganizationService organizationService;
 	@Autowired
-	private OrganizationManagementMapper organizationManagementMapper;
+	private DepartmentMapper departmentMapper;
 	/**部门组织管理列表 **/
 	@RequestMapping(value = "/listOrganizationManagement" , method = RequestMethod.POST)
 	public Result listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
@@ -53,13 +53,13 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
 			return res;
 		}
-		String olo=organizationManagementMapper.selectDepNoByName(name);
+		String olo=departmentMapper.selectDepNoByName(name);
 		if(olo!=null){
 			res.getError().add(buildError("","部门已存在"));
 			return res;
 		}
-		String sdepNo=organizationManagementMapper.selectDepNo(superId);
-		int count=organizationManagementMapper.selectDepNoCount(superId);
+		String sdepNo=departmentMapper.selectDepNo(superId);
+		int count=departmentMapper.selectDepNoCount(superId);
 		if((count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
 			return res;
@@ -94,8 +94,8 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
 			return res;
 		}
-		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
-		int count=organizationManagementMapper.selectDepNoCount(superId);//14
+		String sdepNo=departmentMapper.selectDepNo(superId);//No
+		int count=departmentMapper.selectDepNoCount(superId);//14
 		if((count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
 			return res;
@@ -115,14 +115,14 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
 			return res;
 		}
-		/*OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		/*OrganizationListOut olo=departmentMapper.selectAllById(id);
 		String superId=olo.getName();*/
-		int subordinate=organizationManagementMapper.selectCountBySuperId(id);
+		int subordinate=departmentMapper.selectCountBySuperId(id);
 		if(subordinate>0){
 			res.getError().add(buildError("","存在下级组织不能删除"));
 			return res;
 		}
-		int adminCount=organizationManagementMapper.selectUserById(id);
+		int adminCount=departmentMapper.selectUserById(id);
 		if(adminCount>0){
 			res.getError().add(buildError("","部门被用户选定不能删除"));
 			return res;

+ 1 - 4
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.goafanti.organization.service.impl;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -17,13 +16,11 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
 import com.goafanti.admin.bo.AdminListBo;
-import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderMidMapper;
-import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 @Service
-public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManagementMapper> implements OrganizationService {
+public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> implements OrganizationService {
 	@Autowired
 	private DepartmentMapper departmentMapper;
 	@Autowired