Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 6
Родитель
Сommit
e935135d67
43 измененных файлов с 450 добавлено и 120 удалено
  1. 2 0
      src/main/java/com/goafanti/admin/service/AdminService.java
  2. 30 0
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  3. 2 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  4. 2 0
      src/main/java/com/goafanti/common/dao/PatentNewMapper.java
  5. 2 2
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  6. 2 1
      src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java
  7. 2 0
      src/main/java/com/goafanti/common/dao/UserBusinessMapper.java
  8. 8 0
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  9. 1 1
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  10. 9 2
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  11. 5 0
      src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml
  12. 6 4
      src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml
  13. 46 26
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  14. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml
  15. 15 5
      src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml
  16. 16 0
      src/main/java/com/goafanti/common/mapper/UserBusinessMapper.xml
  17. 3 0
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml
  18. 1 0
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  19. 1 1
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  20. 13 0
      src/main/java/com/goafanti/common/model/OrganizationManagement.java
  21. 9 6
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  22. 30 0
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  23. 1 0
      src/main/java/com/goafanti/customer/service/CustomerService.java
  24. 12 0
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  25. 16 2
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  26. 7 0
      src/main/java/com/goafanti/order/bo/ReceivablesListBo.java
  27. 36 1
      src/main/java/com/goafanti/order/bo/TOrderNewBo.java
  28. 1 0
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  29. 5 4
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  30. 62 0
      src/main/java/com/goafanti/order/enums/ReceivablesStatus.java
  31. 1 6
      src/main/java/com/goafanti/order/service/FundManageOrderService.java
  32. 9 23
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  33. 20 9
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  34. 35 14
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  35. 5 1
      src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java
  36. 15 0
      src/main/java/com/goafanti/organization/bo/OrganizationListOut.java
  37. 3 5
      src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java
  38. 1 1
      src/main/java/com/goafanti/organization/service/OrganizationService.java
  39. 2 1
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  40. 8 0
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  41. 2 2
      src/main/resources/props/config_local.properties
  42. 1 1
      src/main/resources/props/config_test.properties
  43. 1 0
      src/main/webapp/WEB-INF/views/common.html

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -84,4 +84,6 @@ public interface AdminService {
 
 	Pagination<AdminCustomerDetailBo> selectAdminCustomerList(String aid, String startTime, String endTime,Integer type, Integer pageSize, Integer pageNo);
 
+	int updatePrivateBusinessTransfer(String inputId, String uid, String pid);
+
 }

+ 30 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,15 +23,19 @@ 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.UserBusinessMapper;
+import com.goafanti.common.dao.UserLockReleaseMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.customer.bo.BusinessListBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.bo.TOrderNewBo;
 
@@ -42,6 +47,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private UserRoleMapper		userRoleMapper;
 	@Autowired
 	private AdminLocationMapper	adminLocationMapper;
+	@Autowired
+	private UserLockReleaseMapper	userLockReleaseMapper;
+	@Autowired
+	private UserBusinessMapper	userBusinessMapper;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil					passwordUtil;
 	@Override
@@ -384,4 +393,25 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return (Pagination<AdminCustomerDetailBo>)findPage("selectAdminCustomerDetailList", "selectAdminCustomerDetailCount", params, pageNo, pageSize);
 	}
 
+	@Override
+	public int updatePrivateBusinessTransfer(String inputId, String uid, String pid) {
+		String aid=TokenManager.getAdminId();
+		int i=userLockReleaseMapper.updatePrivateBusinessTransfer( inputId,  uid,  pid,aid);
+		if (i>0) {
+			List<BusinessListBo> l=userBusinessMapper.selectBusinessProjectByUAPid(uid, inputId, pid);
+			if (!l.isEmpty()) {
+				UserBusiness ub=new UserBusiness();
+				ub.setId(UUID.randomUUID().toString());
+				ub.setAid(inputId);
+				ub.setUid(uid);
+				ub.setBusinessProjectId(pid);
+				ub.setCustomerStatus(4);
+				ub.setFollowSituation(5);
+				ub.setRemarks("转交客户业务触发");
+				userBusinessMapper.insertSelective(ub);
+			}
+		}
+		return i;
+	}
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -20,6 +20,8 @@ public class AFTConstants {
 	public static final String	CED									= "999998";				// 总裁
 		
 	public static final String  TECH_ADMIN                          = "99998";				// 技术管理员
+	
+	public static final String  FINANCE_ADMIN                       = "99997";				// 财务管理员
 
 	public static final String	AREAADMIN							= "";					// 地区管理员
 

+ 2 - 0
src/main/java/com/goafanti/common/dao/PatentNewMapper.java

@@ -76,4 +76,6 @@ public interface PatentNewMapper {
 	List<PatentNew> AllselectStartPatentNew();
 	
 	List<PatentNew> AllselectEndPatentNew();
+
+	void updateAdmin(@Param("aid")String aid, @Param("transferId")String transferId);
 }

+ 2 - 2
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -92,9 +92,9 @@ public interface TOrderNewMapper {
 
     OrderRefundDetailBo orderRefundDetail(String id);
 
-	int updateFinance(@Param("aid")String aid, @Param("orderNo")String orderNo, @Param("newFinance")String newFinance);
+	int updateFinance(@Param("aid")String aid, @Param("orderNos")List<String> orderNos, @Param("newFinance")String newFinance);
 	int checkContractNo(String sno);
 	Map<String, Object> countTotalAndActually(OrderListBo o);
 	TOrderBillNew getLastPayment(String orderNo);
-
+	int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
 }

+ 2 - 1
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -88,7 +88,6 @@ public interface TemporaryReceivablesMapper {
 	void deleteNormalByaid(String aid);
 
 
-	List<String> getRepeatOrderNo(List<TemporaryReceivablesBo> list);
 
 	void insertBatch(List<TemporaryReceivablesBo> list);
 
@@ -98,4 +97,6 @@ public interface TemporaryReceivablesMapper {
 
 	String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
 
+	int selectReceivablesNumberRepeats(TemporaryReceivables tr);
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserBusinessMapper.java

@@ -83,6 +83,8 @@ public interface UserBusinessMapper {
 	List<BusinessListBo> selectBusinessByUAid(@Param("uid")String uid, @Param("aid")String aid);
 	
 	List<BusinessListBo> selectLockedBusinessByUAid(@Param("uid")String uid, @Param("aid")String aid);
+	
+	List<BusinessListBo> selectBusinessProjectByUAPid(@Param("uid")String uid, @Param("aid")String aid, @Param("pid")String pid);
 
 	BussinessFollowBo findBusinessDetail(@Param("businessId")String businessId);
 

+ 8 - 0
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -100,4 +100,12 @@ public interface UserLockReleaseMapper {
 	void updateProject(@Param("uid")String uid, @Param("aid")String aid, @Param("businessProjectId")String businessProjectId);
 
 	List<LockingReleaseBo> checkTask(@Param("buyerId")String buyerId, @Param("commodityId")String commodityId);
+
+
+	void updateBatchReleaseProject(@Param("uids")List<String> uids, @Param("receiveId")String receiveId, @Param("aid")String aid);
+
+	void updateBatchlockProject(@Param("uid")List<String> uids, @Param("receiveId")String receiveId, @Param("aid")String aid);
+
+	int updatePrivateBusinessTransfer(@Param("inputId")String inputId, @Param("uid")String uid, @Param("pid")String pid,@Param("aid")String aid);
+
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -703,7 +703,7 @@ select
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	<if test="complete ==0 and processState != 8">
-	 and a.process_state &gt; = #{processState}
+	 and a.process_state &gt;= #{processState}
 	</if>
 	<if test="complete ==0 and processState == 8">
 	 and a.process_state &gt;= #{processState} and  a.process_state &lt; 9

+ 9 - 2
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -20,6 +20,7 @@
     <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">
     <!--
@@ -96,7 +97,7 @@
       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
+    super_id, remarks, status,abbreviation,finance_id
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultMap="BaseResultMap">
     <!--
@@ -376,6 +377,9 @@
       <if test="abbreviation != null">
         abbreviation = #{abbreviation,jdbcType=VARCHAR},
       </if>
+      <if test="financeId != null">
+        finance_id = #{financeId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -521,9 +525,12 @@
 		a.remarks,
 		a.status,
 		a.abbreviation,
+		a.finance_id financeId,
+		c.name financeName,
 		b.name as managerName
 	from department a 
-	left join admin b on a.manager_id = b.id 
+	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>

+ 5 - 0
src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml

@@ -553,4 +553,9 @@
     <include refid="Base_Column_List" />
     from patent_new where status =1
     </select>
+    
+    <update id="updateAdmin">
+    update patent_new set aid= #{transferId}
+	where aid= #{aid} 
+    </update>
 </mapper>

+ 6 - 4
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -640,17 +640,18 @@
 	</if>
   </select>
   <select id="financeOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
-      select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
+      	  select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
      ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status,b.process_status processStatus,
      b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a 
 	left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
 	left join (select order_no,sum(amount)as  sumAmount from t_order_invoice where status =2 group by order_no) d
-	on a.order_no=d.order_no where a.status in (1,2) and a.approval in (0,2) 
+	on a.order_no=d.order_no left join department e on b.order_dep=e.id 
+	where a.status in (1,2) and a.approval in (0,2) 
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER} 
 	</if>
 	<if test="financeId !=null">
-	and b.finance_id= #{financeId,jdbcType=VARCHAR}
+	and e.finance_id= #{financeId,jdbcType=VARCHAR}
 	</if>
 	<if test="orderNo !=null">
 	and a.order_no = #{orderNo,jdbcType=VARCHAR}
@@ -674,12 +675,13 @@
   	select count(*) from t_order_invoice a 
 	left join t_order_new b on a.order_no=b.order_no 
 	left join admin c on b.salesman_id=c.id
+	 left join department e on b.order_dep=e.id
 	where a.status in (1,2) and a.approval in (0,2) 
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER} 
 	</if>
 	<if test="financeId !=null">
-	and b.finance_id= #{financeId,jdbcType=VARCHAR}
+	and e.finance_id= #{financeId,jdbcType=VARCHAR}
 	</if>
 	<if test="orderNo !=null">
 	and a.order_no = #{orderNo,jdbcType=VARCHAR}

+ 46 - 26
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1093,15 +1093,16 @@ left join (select x1.order_no,max(create_time) create_time,max(transaction_amoun
 (select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
 	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no
 left join ( select order_no , sum(amount) invoiceAmount from t_order_invoice where status = 2 group by order_no ) g on o.order_no = g.order_no
-where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
+where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-  		and (approval = 0 or approval = 2)
-	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
+  		<if test="o.financeId != null and o.financeId != &quot;&quot;">
+	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
+	  	</if>
   		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
 	  	</if>
@@ -1111,10 +1112,9 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
 	  	<if test="o.contractNo != null and o.contractNo != &quot;&quot;">
   	and o.contract_no like CONCAT('%',#{o.contractNo,jdbcType=VARCHAR},'%')
   	</if>
-  		<if test="o.liquidationStatus != null and o.liquidationStatus != &quot;&quot;">
+  		<if test="o.liquidationStatus != null">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
 	  	</if>
-  		
   		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
@@ -1127,27 +1127,32 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
 	  	<bind name="b" value="o.endTime + ' 23:59:59'" />
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
+	  	<if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != &quot;&quot; and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != &quot;&quot;">
+	  	<bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
+	  	<bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
+	  	and f.create_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
+	  	</if>
 	  	order by o.liquidation_status, o.sign_time desc
 	  	<if test="page_sql != null">
 			${page_sql}
 		</if>
   </select>
   <select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
-  select count(*)
-  	 from t_order_new o 
-  	 left join `user` u on o.buyer_id = u.id 
-  	 left join admin a on o.salesman_id = a.id
-  	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new
-  				group by order_no ) b on b.order_no = o.order_no
-  	 where delete_sign != 1 and outsource=  #{o.outsource,jdbcType=INTEGER}
+  select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
+  	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no
+  	left join department d on o.order_dep = d.id left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from 
+(select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
+	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no
+  	 where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-  		and (approval = 0 or approval = 2)
-	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
+	  	<if test="o.financeId != null and o.financeId != &quot;&quot;">
+	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
+	  	</if>
   		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
 	  	</if>
@@ -1157,7 +1162,7 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
 	  	<if test="o.contractNo != null and o.contractNo != &quot;&quot;">
   	and o.contract_no like CONCAT('%',#{o.contractNo,jdbcType=VARCHAR},'%')
   	</if>
-  		<if test="o.liquidationStatus != null and o.liquidationStatus != &quot;&quot;">
+  		<if test="o.liquidationStatus != null">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
 	  	</if>
   		
@@ -1173,6 +1178,11 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
 	  	<bind name="b" value="o.endTime + ' 23:59:59'" />
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
+	  	<if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != &quot;&quot; and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != &quot;&quot;">
+	  	<bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
+	  	<bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
+	  	and f.create_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
+	  	</if>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
@@ -1186,7 +1196,7 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
   	select 
   		a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.contract_no as contractNo,
   		b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.order_status as orderStatus,
-  		a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,dep.name as depName,d.name as financeName
+  		a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,dep.name as depName,g.name as financeName
   	<if test="specially == 2">
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	</if>
@@ -1196,6 +1206,7 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
   	from t_order_new a  left join `user` b on a.buyer_id=b.id 
   	left join admin c on a.salesman_id=c.id
   	left join department dep on a.order_dep=dep.id
+  	left join admin g on dep.finance_id=g.id
   	left join admin d on a.finance_id=d.id
   	<if test="specially == 2">
 	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
@@ -1413,7 +1424,7 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   
   <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-    select 
+  select 
     a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId,
     a.first_amount as firstAmount,a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus,
     a.liquidation_status as liquidationStatus, a.process_status as processStatus, a.project_status as projectStatus, a.approval,
@@ -1423,10 +1434,11 @@ where super_id is null ) e on e.order_no=a.order_no
     a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
     c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName ,e.back_status as backStatus,f.name as initiateName,
     e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
-    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.additional_order additionalOrder
-    from t_order_new a left join `user` b on a.buyer_id=b.id left join admin c on a.salesman_id=c.id
-    left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
-  	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
+    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,
+    h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile
+    from t_order_new a left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.id
+    left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
+    left join admin h on dep.finance_id=h.id left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
   	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
     where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
@@ -1497,7 +1509,10 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   <update id="updateFinance" parameterType="string">
   update t_order_new set finance_id= #{newFinance,jdbcType=VARCHAR}
-	where order_no= #{orderNo,jdbcType=VARCHAR}
+	where order_no in	
+	<foreach close=")" collection="orderNos" item="orderNo" open="(" separator=",">
+	 #{orderNo}
+  	</foreach> 
 	and finance_id= #{aid,jdbcType=VARCHAR}
   </update>
   <select id="checkContractNo" resultType="java.lang.Integer">
@@ -1509,15 +1524,16 @@ where super_id is null ) e on e.order_no=a.order_no
   select sum(b.amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount from t_order_new o 
   left join department d   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id 
   left join ( select sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no
-    where delete_sign != 1 and outsource=  #{outsource,jdbcType=INTEGER}
+    where delete_sign != 1  and (approval = 0 or approval = 2) and outsource=  #{outsource,jdbcType=INTEGER}
   	 	<if test="processStatus == 3">
 	  	and o.process_status = #{processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	<if test="processStatus == 4">
 	  	and o.process_status &gt;= #{processStatus,jdbcType=INTEGER}
 	  	</if>
-  		and (approval = 0 or approval = 2)
-	  	and o.finance_id = #{financeId,jdbcType=VARCHAR}
+  		<if test="financeId != null and financeId != &quot;&quot;">
+	  	and d.finance_id = #{financeId,jdbcType=VARCHAR}
+	  	</if>
   		<if test="orderStatus != null and orderStatus != &quot;&quot;">
 	  	and o.order_status = #{orderStatus,jdbcType=INTEGER}
 	  	</if>
@@ -1527,7 +1543,7 @@ where super_id is null ) e on e.order_no=a.order_no
 	  	<if test="contractNo != null and contractNo != &quot;&quot;">
   	and o.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
   	</if>
-  		<if test="liquidationStatus != null and liquidationStatus != &quot;&quot;">
+  		<if test="liquidationStatus != null ">
 	  	and o.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
 	  	</if>
   		
@@ -1550,4 +1566,8 @@ where super_id is null ) e on e.order_no=a.order_no
 	where order_no= #{orderNo}
 	order by create_time desc limit 1;
   </select>
+  <update id="updateSalesmanId">
+  	update t_order_new set salesman_id= #{transferId},old_salesman_id= #{aid}
+	where delete_sign !=1 and salesman_id= #{aid}
+  </update>
 </mapper>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -464,8 +464,8 @@
 	b.liquidation_status liquidationStatus,a.refund_status refundStatus,d.name adminName,f.name financeName
 	from t_order_outsource a
 	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
-	left join admin d on b.salesman_id=d.id left join department e on d.department_id=e.id
-	left join admin f on b.finance_id=f.id
+	left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
+	left join admin f on e.finance_id=f.id
 	where b.delete_sign !=1 and b.outsource=1
 		and d.department_id in
   	<foreach close=")" collection="deps" item="deps" open="(" separator=",">

+ 15 - 5
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -377,7 +377,7 @@
   </delete>
   <delete id="deleteNormalByaid">
   delete from temporary_receivables
-    where aid = #{aid} and status !=2
+    where aid = #{aid} and status &lt; 2
   </delete>
   <select id="selectByaid" resultMap="BaseResultMap">
   
@@ -536,9 +536,19 @@
   </insert>
   
   <update id="updateRepeatOrderNo" >
-	update temporary_receivables x ,(select a.id from temporary_receivables a left join (select * from (select order_no,amount,aid,count(*) counts from temporary_receivables
-	group by order_no,amount,aid)a where a.counts>1 and a.aid=  #{aid} ) b  on a.order_no=b.order_no 
-	where a.amount=b.amount and a.aid= #{aid} )y  set status=1
-	where x.id=y.id
+	update temporary_receivables x ,(select a.order_no,a.amount,a.receivables_time,a.nickname 
+	from (select a.order_no,a.corporate_name,a.amount,a.receivables_time,b.nickname,count(1) counts 
+	from temporary_receivables a left join (select x1.order_no,y1.nickname from t_order_new x1 
+	left join user y1 on x1.buyer_id=y1.id )b on a.order_no=b.order_no where a.corporate_name=b.nickname 
+	group by a.order_no,a.corporate_name,a.amount,a.receivables_time)a where a.counts>1 )y set x.status=1 
+	where x.order_no=y.order_no and x.amount=y.amount and x.receivables_time=y.receivables_time 
+	and x.corporate_name=y.nickname and x.aid= #{aid}
   </update>
+  <select id="selectReceivablesNumberRepeats"  parameterType="com.goafanti.common.model.TemporaryReceivables" resultType="java.lang.Integer">
+   select  count(*) from t_order_bill_new a left join user b on a.payer_id=b.id
+	where a.order_no= #{orderNo} 
+	and b.nickname= #{corporateName}
+	and a.transaction_amount= #{amount} 
+	and a.financial_pay_time= #{receivablesTime}
+  </select>
 </mapper>

+ 16 - 0
src/main/java/com/goafanti/common/mapper/UserBusinessMapper.xml

@@ -467,4 +467,20 @@
 	set aid= #{transferId,jdbcType=VARCHAR}
 	where aid= #{aid,jdbcType=VARCHAR}
   </update>
+  <select id="selectBusinessProjectByUAPid" resultType="com.goafanti.customer.bo.BusinessListBo">
+  select 
+		a.id as businessId,
+		a.uid,
+		a.business_project_id as businessProjectId,
+		a.follow_situation as followSituation,
+		a.customer_status as customerStatus,
+		a.remarks,
+		b.bname as businessProjectName,
+		c.cname as businessvarietiesName
+	from user_business a
+	left join business_project b on a.business_project_id = b.id
+	left join business_category c on b.cid = c.id
+	where  a.uid = #{uid,jdbcType=VARCHAR} and a.aid = #{aid,jdbcType=VARCHAR} 
+	and a.business_project_id= #{pid} and  a.customer_status != 6
+  </select>
 </mapper>

+ 3 - 0
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -410,4 +410,7 @@
 	and uid=#{buyerId,jdbcType=VARCHAR}
 	and business_project_id=#{commodityId,jdbcType=VARCHAR}
   </select>
+  <update id="updatePrivateBusinessTransfer">
+ 	update user_lock_release set aid=#{inputId} where uid= #{uid} and business_project_id= #{pid} and aid= #{aid}; 
+  </update>
 </mapper>

+ 1 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1609,6 +1609,7 @@
   <update id="updateDimissionTransfer">
    update user
 		set aid=#{transferId,jdbcType=VARCHAR},
+		information_maintainer=#{transferId,jdbcType=VARCHAR},
 			source=3,
 			transfer_time=now()
 		where aid=#{aid,jdbcType=VARCHAR}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1133,7 +1133,7 @@
   
   <select id="selectBusinessCount" parameterType="com.goafanti.customer.bo.BusinessListBo" resultType="java.lang.Integer">
   	select
-  		count(0)
+  		count(*)
   	from
 		user_business a inner join user b on
 		a.uid = b.id left join business_project c on

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

@@ -68,6 +68,11 @@ public class OrganizationManagement {
 	 * 缩写
 	 */
 	private String abbreviation;
+	
+	/**
+	 * 负责财务id
+	 */
+	private String financeId;
 	/**
 	 * 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
@@ -292,4 +297,12 @@ public class OrganizationManagement {
 	public void setAbbreviation(String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
+
+	public String getFinanceId() {
+		return financeId;
+	}
+
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
 }

+ 9 - 6
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -8,6 +8,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.user.service.UserService;
@@ -36,12 +37,14 @@ public class ReleaseUserTask {
 			List<LockingReleaseBo> userTmpList = null;
 			List<LockingReleaseBo> businessTmpList = null;
 			for(User u : userList){
-				userTmpList = customerServiceImpl.selectWaitReleaseCustomer(u.getId());
-//				userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
-				lockUserList.addAll(userTmpList);
-				businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
-//				businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
-				lockBusinessList.addAll(businessTmpList);
+				if(StringUtils.isNotBlank(u.getId())) {
+					userTmpList = customerServiceImpl.selectWaitReleaseCustomer(u.getId());
+//					userTmpList = customerServiceImpl.selectWaitReleaseCustomer("1");
+					lockUserList.addAll(userTmpList);
+					businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
+//					businessTmpList = customerServiceImpl.selectWaitReleaseBusiness("1");
+					lockBusinessList.addAll(businessTmpList);
+				}
 			}
 		List<LockingReleaseBo> newList=new ArrayList<LockingReleaseBo>();
 			  if (lockUserList.size()>0) {

+ 30 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -190,6 +190,13 @@ public class AdminCustomerApiController extends BaseApiController{
 		res.setData(customerService.listSignPersonalCustomer(cli, pageNo, pageSize));
 		return res;
 	}
+	/** 签单客户转交 **/
+	@RequestMapping(value = "/customerHandOver", method = RequestMethod.POST)
+	public Result listSignPersonalCustomer(String userIds ,String receiveId){
+		Result res = new Result();
+		res.setData(customerService.customerHandOver( userIds , receiveId));
+		return res;
+	}
 	
 	/** 客户即时检索 **/
 	@RequestMapping(value = "/findCustomerByName",method = RequestMethod.GET)
@@ -1139,6 +1146,29 @@ public class AdminCustomerApiController extends BaseApiController{
 		return res;
 	}
 	
+	/**
+	 * 
+	 * @param inputId 	业务转移客户id(接收者)
+	 * @param uid		被转移的客户
+	 * @param pid		呗转移的业务
+	 * @return
+	 */
+	@RequestMapping(value = "/privateBusinessTransfer", method = RequestMethod.POST)
+	public Result privateBusinessTransfer(String inputId,String uid,String pid ) {
+		Result res = new Result();
+		if (StringUtils.isBlank(inputId)) {
+			res.getError().add(buildError("请确正确的接收者。","请确正确的接收者。"));
+			return res;
+		}
+		int i= adminService.updatePrivateBusinessTransfer( inputId, uid, pid );
+		if (i<1) {
+			res.getError().add(buildError("请确认客户与业务归属是否正确。","请确认客户与业务归属是否正确。"));
+			return res;
+		}
+		res.data(i);
+		return res;
+	}
+	
 }
 
 

+ 1 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -507,6 +507,7 @@ public interface CustomerService {
 	int updateUserLevel(User u);
 	public  Float countIntegrity(CustomerOrganizationDetailBo bo);
 	XSSFWorkbook privateUnitCustomerOutXls(CustomerListIn cli ,Integer sort,Integer sortType,Integer pageNo, Integer pageSize);
+	int customerHandOver(String userIds, String receiveId);
 	
 	
 }

+ 12 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3,6 +3,8 @@ package com.goafanti.customer.service.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -1487,5 +1489,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return wb;
 	}
 
+	@Override
+	public int customerHandOver(String userIds, String receiveId) {
+/*		String [] str=userIds.split(",");
+		String aid=TokenManager.getAdminId();
+		List<String> uids=Arrays.asList(str);
+		userLockReleaseMapper.updateBatchReleaseProject(uids,receiveId,aid);
+		userLockReleaseMapper.updateBatchlockProject(uids,receiveId,aid);*/
+		return 0;
+	}
+
 
 }

+ 16 - 2
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -82,8 +82,10 @@ public class OrderListBo {
 	private String finalReceivablesTime;
 	/** 开票金额 */
 	private String invoiceAmount;
-	
-	
+	/** 结束最后收款 时间*/
+	private String endFinalReceivablesTime;
+	/** 开始最后收款 时间*/
+	private String startFinalReceivablesTime;	
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -313,4 +315,16 @@ public class OrderListBo {
 	public void setOutsourceName(String outsourceName) {
 		this.outsourceName = outsourceName;
 	}
+	public String getEndFinalReceivablesTime() {
+		return endFinalReceivablesTime;
+	}
+	public void setEndFinalReceivablesTime(String endFinalReceivablesTime) {
+		this.endFinalReceivablesTime = endFinalReceivablesTime;
+	}
+	public String getStartFinalReceivablesTime() {
+		return startFinalReceivablesTime;
+	}
+	public void setStartFinalReceivablesTime(String startFinalReceivablesTime) {
+		this.startFinalReceivablesTime = startFinalReceivablesTime;
+	}
 }

+ 7 - 0
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -10,6 +10,7 @@ public class ReceivablesListBo {
 	private String settlementAmount;
 	private String depName;
 	private Integer status;
+	private Integer inptStatus;
 	private String amount;
 	private String receivablesTimes;
 	private String createTimes;
@@ -99,6 +100,12 @@ public class ReceivablesListBo {
 	public void setSettlementAmount(String settlementAmount) {
 		this.settlementAmount = settlementAmount;
 	}
+	public Integer getInptStatus() {
+		return inptStatus;
+	}
+	public void setInptStatus(Integer inptStatus) {
+		this.inptStatus = inptStatus;
+	}
 	
 	
 

+ 36 - 1
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -31,7 +31,10 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer locationCity;
 	private Integer locationArea;
 	private String postalAddress;
-	
+	private String NowFinance;
+	private String  NowFinanceMobile;
+	private String oldSalesmanName;
+	private String oldSalesmanMobile;
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -241,5 +244,37 @@ public class TOrderNewBo extends TOrderNew{
 	public void setUncollectedAmount(String uncollectedAmount) {
 		this.uncollectedAmount = uncollectedAmount;
 	}
+
+	public String getNowFinance() {
+		return NowFinance;
+	}
+
+	public void setNowFinance(String nowFinance) {
+		NowFinance = nowFinance;
+	}
+
+	public String getNowFinanceMobile() {
+		return NowFinanceMobile;
+	}
+
+	public void setNowFinanceMobile(String nowFinanceMobile) {
+		NowFinanceMobile = nowFinanceMobile;
+	}
+
+	public String getOldSalesmanName() {
+		return oldSalesmanName;
+	}
+
+	public void setOldSalesmanName(String oldSalesmanName) {
+		this.oldSalesmanName = oldSalesmanName;
+	}
+
+	public String getOldSalesmanMobile() {
+		return oldSalesmanMobile;
+	}
+
+	public void setOldSalesmanMobile(String oldSalesmanMobile) {
+		this.oldSalesmanMobile = oldSalesmanMobile;
+	}
 	
 }

+ 1 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -444,6 +444,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		orderNewService.updateFinance( orderNo, newFinance);
 		return res;
 	}
+	
 	/**
 	 * 查看订单日志
 	 */

+ 5 - 4
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;
@@ -89,7 +90,10 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	public Result financeList(OrderListBo order, Integer pageNo, Integer pageSize ){
 		Result res = new Result();
 		//财务专员自己的id
-		order.setFinanceId(TokenManager.getAdminId());
+		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
+		&& !TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)) {
+			order.setFinanceId(TokenManager.getAdminId());
+		}
 		//order.setProcessStatus(3);//分配给自己 改为前端 传3未分配  4已分配
 		order.setOrderStatus(2);//营销管理员审核通过
 		res.setData(fundManageOrderServiceImpl.financeList(order, pageNo, pageSize));
@@ -169,9 +173,6 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		if (StringUtils.isBlank(orderNo)) {
 			res.getError().add(buildError("","订单必须指定。"));
 		}
-		if(fundManageOrderServiceImpl.checkFinanceApproval(orderNo)) {
-			res.getError().add(buildError("","订单非特批或流程不正确。"));
-		}
 		res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo));
 		return res;
 	}

+ 62 - 0
src/main/java/com/goafanti/order/enums/ReceivablesStatus.java

@@ -0,0 +1,62 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 回款状态
+ *
+ */
+public enum ReceivablesStatus {
+	ZC(0,"正常"),
+	CF(1,"重复"),
+	DCYC(2,"订单异常"),
+	JEYC(3,"金额异常"),
+	MCYC(4,"名称异常"),
+	YSK(5,"已收款");
+	
+	private ReceivablesStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, ReceivablesStatus> status = new HashMap<Integer, ReceivablesStatus>();
+
+	static {
+		for (ReceivablesStatus value : ReceivablesStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static ReceivablesStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return ZC;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	public static String getValueByCode(Integer code){
+        for(ReceivablesStatus bonusSubject:ReceivablesStatus.values()){
+            if(code.equals(bonusSubject.getCode())){
+                return bonusSubject.getDesc();
+            }
+        }
+        return  null;
+    }
+	
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 1 - 6
src/main/java/com/goafanti/order/service/FundManageOrderService.java

@@ -28,6 +28,7 @@ public interface FundManageOrderService {
 	 * @return
 	 */
 	Map<String, Object> financeList(OrderListBo order,Integer pageNo,Integer pageSize);
+	
 
 	/**
 	 * 财务管理员分派订单给财务专员
@@ -98,11 +99,5 @@ public interface FundManageOrderService {
 	 * @return
 	 */
 	int updateFinanceApproval(String orderNo);
-	/**
-	 * 财务特批审核检查
-	 * @param orderNo
-	 * @return
-	 */
-	boolean checkFinanceApproval(String orderNo);
 	
 }

+ 9 - 23
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
@@ -57,6 +58,7 @@ import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.FundManageOrderService;
+import com.goafanti.organization.bo.OrganizationListOut;
 
 @Service
 public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements FundManageOrderService {
@@ -83,6 +85,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	JDBCIdGenerator	idGenerator;
 	@Autowired
 	NoticeMapper	noticeMapper;
+	@Autowired
+	private OrganizationManagementMapper	organizationManagementMapper;
 	Logger	logger	= LoggerFactory.getLogger(FundManagerOrderServiceImpl.class);
 	@SuppressWarnings("unchecked")
 	@Override
@@ -154,17 +158,13 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
-		/*List<OrderListBo> list=(List<OrderListBo>) data.getList();
-		for (OrderListBo ob : list) {
-			TOrderBillNew lp=tOrderNewMapper.getLastPayment(ob.getOrderNo());
-			ob.setFinalReceivables(lp.getTransactionAmount().toString());
-			ob.setFinalReceivablesTime(lp.getCreateTimes());
-		}*/
 		result.put("pagination", data);
 		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order);
 		result.put("count", count);
 		return result;
 	}
+	
+	
 
 	@Override
 	public Integer updateReject(TOrderBack back) {
@@ -294,12 +294,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);
-		if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() 
-				|| lstaus == LiquidationNewState.ALREADY_PAY.getCode()) 
-					&& o.getProcessStatus() < ProcessStatus.YPZXSGLY.getCode()){
-			//流程状态是3,结算是付款的话
-			orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
-		}
 		if(result > 0){
 			result = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 			//如果达到奖金发放要求新增奖金信息
@@ -510,24 +504,16 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	@Override
 	public int updateFinanceApproval(String orderNo) {
+		TOrderNew new1 = tOrderNewMapper.selectByPrimaryKey(orderNo);
 		TOrderNew t=new TOrderNew();
 		checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+		OrganizationListOut oo=organizationManagementMapper.selectAllById(new1.getOrderDep());
+		t.setFinanceId(oo.getFinanceId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
-	@Override
-	public boolean checkFinanceApproval(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if (t.getApproval()!=ApprovalNewState.TG.getCode()) {
-			return true;
-		}
-		if (t.getProcessStatus()!=ProcessStatus.YPCWZY.getCode()) {
-			return true;
-		}
-		return false;
-	}
 }
 
 

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

@@ -5,6 +5,8 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -82,6 +84,7 @@ import com.goafanti.order.enums.TaskState;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
+import com.goafanti.organization.bo.OrganizationListOut;
 
 @Service
 public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements OrderNewService {
@@ -442,7 +445,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
-				t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 			}else {
 				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 			}
@@ -570,7 +573,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
-			if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+			if(t2.getOutsource()==0) {
+				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+			}
 			addOrderLog(orderNo, OrderLogProcess.TP.getCode());
 		} else {
 			t.setApproval(3);
@@ -586,7 +591,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public List<TOrderDun> selectOrderDun(String orderNo) {
-		
 		return tOrderDunMapper.selectByOrderNoDunSubject(orderNo);
 	}
 
@@ -660,19 +664,23 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Calendar c=Calendar.getInstance();
 		int y=c.getWeekYear();
 		String ys="-"+y;
+		//判断编号是否类似‘-2019’,是则为有效编号
 		if (contractNo.contains(ys)) {
 			IdleContractNo i=new IdleContractNo();
 			i.setAid(TokenManager.getAdminId());
 			i.setContractNo(contractNo);
 			i.setUsedOrderNo(orderNo);
-			OrganizationManagement o=organizationManagementMapper.selectByPrimaryKey(orderDep);
-			i.setAbbreviation(o.getAbbreviation());
+			//如果找不到订单部门,则取订单编号-前面的缩写
+			if(StringUtils.isNotBlank(orderDep)) {
+				OrganizationManagement o=organizationManagementMapper.selectByPrimaryKey(orderDep);
+				i.setAbbreviation(o.getAbbreviation());
+			}else {
+				i.setAbbreviation(contractNo.substring(0, contractNo.indexOf("-")));
+			}
 			idleContractNoMapper.insertSelective(i);
 		}
 	}
 
-
-
 	@Override
 	public boolean checkOderSettlementAmount(String orderNo) {
 		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
@@ -863,11 +871,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateFinance(String orderNo, String newFinance) {
-		checkDeleteSign(orderNo);
 		String aid=TokenManager.getAdminId();
-		return tOrderNewMapper.updateFinance(aid,orderNo,newFinance);
+			String[] l=orderNo.split(",");
+			List<String> orderNos=new ArrayList<>(Arrays.asList(l));
+			tOrderNewMapper.updateFinance(aid,orderNos,newFinance);
+			return 1;
 		
 	}
+	
 
 
 

+ 35 - 14
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -25,6 +25,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.util.StringUtil;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -61,6 +62,7 @@ import com.goafanti.order.bo.OrderReportBo;
 import com.goafanti.order.bo.ReceivablesListBo;
 import com.goafanti.order.bo.TOrderBonusBo;
 import com.goafanti.order.bo.TOrderInvoiceBo;
+import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.BonusSubject;
@@ -68,6 +70,7 @@ import com.goafanti.order.enums.LiquidationNewState;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.ProjectNewStage;
+import com.goafanti.order.enums.ReceivablesStatus;
 import com.goafanti.order.enums.TransactionSubject;
 import com.goafanti.order.service.FundManageOrderService;
 import com.goafanti.order.service.OrderBillService;
@@ -115,6 +118,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	}
 	@Override
 	public int updateReceivables(TemporaryReceivablesBo t) {
+		t.setOrderNo(t.getOrderNo().trim());
+		t.setStatus(ReceivablesStatus.ZC.getCode());
 		if(t.getReceivablesTimes()!=null) {
 			try {
 				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
@@ -147,16 +152,23 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//获取已收款
 			BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
 			//获取总金额
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(tr.getOrderNo());
-			//如果订单不是自己的则也不允许收款
-			if(t==null||t.getOrderNo()==null||!t.getFinanceId().equals(TokenManager.getAdminId())) {
-				tr.setStatus(2);
+			TOrderNewBo t=tOrderNewMapper.getOrderNewDetail(tr.getOrderNo());
+			//订单匹配不到
+			if(t==null||t.getOrderNo()==null) {
+				tr.setStatus(ReceivablesStatus.DCYC.getCode());
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
+			}else if(!tr.getCorporateName().equals(t.getUserName())) {
+				tr.setStatus(ReceivablesStatus.MCYC.getCode());
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
+			}else if(temporaryReceivablesMapper.selectReceivablesNumberRepeats(tr)>0) {
+				tr.setStatus(ReceivablesStatus.YSK.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				continue;
 			}
 			//计算收款结果
 			BigDecimal bd = bill.add(tr.getAmount().abs());
-			
 			//判断表中数据
 			BigDecimal count = new BigDecimal(0).add(bd);
 			for (TOrderBillNew tBill : listBull) {
@@ -171,7 +183,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			bonus.setGrantBy(TokenManager.getAdminId());
 			int lstaus = 0;//如果订单流水小于首付 lstaus 0
 			if(count.compareTo(t.getTotalAmount()) == 1){//如果订单流水总额大于总金额 return -1
-				tr.setStatus(2);
+				tr.setStatus(ReceivablesStatus.JEYC.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				continue;
 			}else if (count.compareTo(t.getTotalAmount()) == 0) {//等于总额
@@ -246,12 +258,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//这里的已收金额是以前收的所有金额加上本次收的金额
 			orderNew.setSettlementAmount(count);
 			orderNew.setLiquidationStatus(lstaus);
-			if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() 
-					|| lstaus == LiquidationNewState.ALREADY_PAY.getCode()) 
-						&& t.getProcessStatus() < ProcessStatus.YPZXSGLY.getCode()){
-				//流程状态是3,结算是付款的话
-				orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
-			}
 			tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 				//如果达到奖金发放要求新增奖金信息
 				if(null != bonus.getBonusSubject()){
@@ -270,7 +276,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		}else {
 			return -1;
 		}
-			
 		LoggerUtils.debug(getClass(), "=========================批量导入结束===================");
 		return 1;
 	}
@@ -299,6 +304,22 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(null!=status)parameter.put("status", status);
 		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
+		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
+		
+		for (ReceivablesListBo r : list) {
+			//设置导入信息数据是否有问题判断
+			// InptStatus 0 正常 1内容不完整 2订单未能匹配 3名称不匹配
+			if (StringUtils.isBlank(r.getAmount())||StringUtils.isBlank(r.getOrderNo())
+					||StringUtils.isBlank(r.getCorporateName())||r.getReceivablesTimes()==null) {
+				r.setInptStatus(1);
+			}else if(r.getTotalAmount()==null) {
+				r.setInptStatus(2);
+			}else if(!r.getCorporateName().equals(r.getNickname())) {
+				r.setInptStatus(3);
+			}else {
+				r.setInptStatus(0);
+			}
+		}
 		return p;
 	}
 	
@@ -392,7 +413,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 						trb.setFinancialPayNo(getCellValue(cell));
 						break;
 					case 1:
-						trb.setOrderNo(getCellValue(cell));
+						trb.setOrderNo(getCellValue(cell).trim());
 						break;
 					case 2:
 						trb.setCorporateName(getCellValue(cell));

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

@@ -10,6 +10,7 @@ import org.hibernate.validator.constraints.Mod11Check.ProcessingDirection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.OutsourceOrganizationMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
@@ -27,11 +28,14 @@ import com.goafanti.order.bo.OutsourceOrganizationBo;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.order.service.OutsourceOrgService;
+import com.goafanti.organization.bo.OrganizationListOut;
 @Service
 public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapper> implements OutsourceOrgService {
 	@Autowired
 	private OutsourceOrganizationMapper  outsourceOrganizationMapper;
 	@Autowired
+	private OrganizationManagementMapper	organizationManagementMapper;
+	@Autowired
 	private TOrderOutsourceMapper	tOrderOutsourceMapper;
 	@Autowired
 	private TOrderNewMapper	tOrderNewMapper;
@@ -94,7 +98,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 		if (o.getRefundStatus()==1) {
 			t.setOrderNo(o.getOrderNo());
 			t.setOrderStatus(2);//订单审核标记通过
-			t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+			t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 			addOrderLog(o.getOrderNo(),OrderLogProcess.WBSH.getCode());
 			tOrderNewMapper.updateByPrimaryKeySelective(t);
 		}else {

+ 15 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -35,6 +35,9 @@ public class OrganizationListOut {
 	 * 缩写
 	 */
 	private String abbreviation;
+	private String financeName;
+	
+	private String financeId;
 	public String getUid() {
 		return uid;
 	}
@@ -131,6 +134,18 @@ public class OrganizationListOut {
 	public void setAbbreviation(String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
+	public String getFinanceId() {
+		return financeId;
+	}
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
+	public String getFinanceName() {
+		return financeName;
+	}
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
 	
 	
 	

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

@@ -107,7 +107,7 @@ public class AdminOrganizationController extends BaseApiController{
 	/**修改信息**/
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
 	public Result updateOrganization(String name, String type, String managerId, String superId, String status,
-			String remarks,String id,String abbreviation){
+			String remarks,String id,String abbreviation,String financeId){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -116,8 +116,6 @@ public class AdminOrganizationController extends BaseApiController{
 			return res;
 		}		
 		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
-	/*	String sdepNo=organizationManagementMapper.selectDepNoByName(superId);*/
-     /*superId=organizationManagementMapper.selectIdByName(superId);*/
 		int Count=organizationManagementMapper.selectDepNoCount(superId);//14
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
@@ -136,7 +134,7 @@ public class AdminOrganizationController extends BaseApiController{
 				}
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation,financeId);
 		}
 		if(Count>=10){
 			String dep=sdepNo+Count;
@@ -146,7 +144,7 @@ public class AdminOrganizationController extends BaseApiController{
 				dep=sdepNo+Count;
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation,financeId);
 		}
 		
 		return res.data(i);

+ 1 - 1
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -39,6 +39,6 @@ public interface OrganizationService {
 	
 	int deleteById(String id);
 	
-	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id,String depn,String abbreviation);
+	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id,String depn,String abbreviation,String financeId);
 	
 }

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

@@ -96,7 +96,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return 1;
 	}
 	@Override
-	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn,String abbreviation) {
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn,String abbreviation,String financeId) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
@@ -109,6 +109,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setRemarks(remarks); 
 		om.setId(id);
 		om.setAbbreviation(abbreviation);
+		om.setFinanceId(financeId);
 		int x=organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;

+ 8 - 0
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -16,9 +16,11 @@ import org.springframework.stereotype.Service;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.dao.ContractTaskLogMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
+import com.goafanti.common.dao.PatentNewMapper;
 import com.goafanti.common.dao.RoleMapper;
 import com.goafanti.common.dao.RolePermissionMapper;
 import com.goafanti.common.dao.RoleResourcesMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
 import com.goafanti.common.dao.UserBusinessMapper;
@@ -54,10 +56,14 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	@Autowired
 	UserBusinessMapper		userBusinessMapper;
 	@Autowired
+	PatentNewMapper			patentNewMapper;
+	@Autowired
 	OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
 	TOrderTaskMapper	tOrderTaskMapper;
 	@Autowired
+	TOrderNewMapper	tOrderNewMapper;
+	@Autowired
 	TTaskLogMapper	tTaskLogMapper;
 	@Override
 	public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
@@ -195,6 +201,8 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				userMapper.updateDimissionTransfer(aid,transferId);
 			}
 			if (s==roleResources.QDYW.getCode()) {
+				tOrderNewMapper.updateSalesmanId(aid, transferId);
+				patentNewMapper.updateAdmin(aid,transferId);
 				roleResourcesMapper.updateLockRelease("1",aid,transferId);//将业务锁转给指定人
 			}
 			if (s==roleResources.XMRW.getCode()) {

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.23
+static.host=//sb.jishutao.com/1.1.24
 avatar.host=//sb.jishutao.com
 
 #连测试
 #avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.23
+#static.host=//static.jishutao.com/1.1.24
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.23
+static.host=//static.jishutao.com/1.1.24
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload

+ 1 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -368,6 +368,7 @@
 				uid : /*[[${adminData.id}]]*/'',
 				departmentId : /*[[${adminData.departmentId}]]*/'',
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
+				isFinanceAdmin : /*[[${shiro.hasRole('99997')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;