wanghui лет назад: 7
Родитель
Сommit
cd85a44306

+ 3 - 1
src/main/java/com/goafanti/business/service/BusinessProjectService.java

@@ -66,6 +66,8 @@ public interface BusinessProjectService {
 	
 	List<BusinessProject> selectBusinessProjectByName(String businessName,String cid);
 
-	 List<BusinessVarieties> selectBusinessProjectCatalog();
+	List<BusinessVarieties> selectBusinessProjectCatalog();
+	 
+	
 	
 }

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

@@ -95,4 +95,6 @@ public interface BusinessProjectMapper {
 	List<ProjectBo> selectServiceProjectDetail();
 
 	 List<BusinessVarieties> selectBusinessProjectCatalog();
+
+	
 }

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

@@ -811,4 +811,6 @@
   <select id="selectBusinessProjectCatalog" resultType="com.goafanti.common.model.BusinessVarieties">
   	select id,cname from business_varieties where delete_sign = 0
   </select>
+  
+
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1290,6 +1290,12 @@
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="isDistributionFinance == 0">
+			and a.finance_id is null
+		</if>
+		<if test="isDistributionFinance == 1">
+			and a.finance_id is  not null
+		</if>
 		<if test="buyerName != null and buyerName != ''">
 			and b.nickname = #{buyerName,jdbcType=VARCHAR}
 		</if>
@@ -1338,6 +1344,12 @@
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="isDistributionFinance == 0">
+			and a.finance_id is null
+		</if>
+		<if test="isDistributionFinance == 1">
+			and a.finance_id is not null
+		</if>
 		<if test="buyerName != null and buyerName != ''">
 			and b.nickname = #{buyerName,jdbcType=VARCHAR}
 		</if>

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

@@ -89,6 +89,16 @@ public class AdminCustomerApiController extends BaseApiController{
 	@RequestMapping(value = "/listAllManagePersonalCustomer" , method = RequestMethod.POST)
 	public Result listAllManagePersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
 		Result res = new Result();
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+			cli.setAid(TokenManager.getAdminId());
+		}
+		res.setData(customerService.listAllManagePersonalCustomer(cli, pageNo, pageSize));
+		return res;
+	}
+	/** 非管理的客户查询 **/
+	@RequestMapping(value = "/listPersonalCustomer" , method = RequestMethod.POST)
+	public Result listPersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
+		Result res = new Result();
 		res.setData(customerService.listAllManagePersonalCustomer(cli, pageNo, pageSize));
 		return res;
 	}

+ 9 - 4
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -169,11 +169,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
-			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
+			Integer pSize, Integer boutique, Integer hot, String techBrokerId,String recordPerson) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
-
+		
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -196,6 +196,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
 		}
+		if (null!=recordPerson) {
+			params.put("recordPerson",  recordPerson);
+		}
 
 		/*if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
@@ -1058,7 +1061,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
-			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
+			Integer pSize, Integer boutique, Integer hot, String techBrokerId,String recordPerson) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
@@ -1072,8 +1075,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		}
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
+		} 
+		if (null != recordPerson) {
+			params.put("recordPerson", recordPerson);
 		}
-
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
 		}

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

@@ -384,18 +384,18 @@ public class AdminOrderApiController extends CertifyApiController {
 			String endDate,Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(orderServiceImpl.selectSettlementList(orderNo, depId, buyerName, salesmanName,
-				TokenManager.getAdminId(), financeName, orderStatus, liquidationStatus, approval,startDate,endDate, pageNo, pageSize));
+				TokenManager.getAdminId(), financeName, orderStatus, liquidationStatus, approval,null,startDate,endDate, pageNo, pageSize));
 		return res;
 	}
 	
 	/** 结算订单管理 **/
 	@RequestMapping(value = "/listAllSettlement", method = RequestMethod.POST)
 	public Result listAllSettlement(String orderNo, String depId,String buyerName,String salesmanName, String financeName,
-			Integer orderStatus,Integer liquidationStatus,Integer approval,String startDate,String endDate,
+			Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,String startDate,String endDate,
 			Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(orderServiceImpl.selectSettlementList(orderNo, depId, buyerName, salesmanName,
-				"", financeName, orderStatus, liquidationStatus, approval, startDate,endDate, pageNo, pageSize));
+				"", financeName, orderStatus, liquidationStatus, approval,isDistributionFinance, startDate,endDate, pageNo, pageSize));
 		return res;
 	}
 	
@@ -467,8 +467,8 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","确认状态"));
 			return res;
 		}else if(confirm  == AuditState.AUDIT_SUCCESS.getCode()){
-			if(StringUtils.isBlank(financialPayNo) || StringUtils.isBlank(financialPayTime)){
-				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水号和财务流水时间"));
+			if(StringUtils.isBlank(financialPayTime)){
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水时间"));
 				return res;
 			}
 		}

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

@@ -260,7 +260,7 @@ public interface OrderService {
 	 * @return
 	 */
 	Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,  
-			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,
+			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
 			String startDate,String endDate,Integer pageNo, Integer pageSize);
 	
 	/**

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

@@ -1162,7 +1162,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,  
-			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,
+			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>();
 		if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
@@ -1174,6 +1174,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(orderStatus != null) params.put("orderStatus", orderStatus);
 		if(liquidationStatus != null) params.put("liquidationStatus", liquidationStatus);
 		if(approval != null) params.put("approval", approval);
+		if(isDistributionFinance != null) params.put("isDistributionFinance", isDistributionFinance);
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
 		return (Pagination<OrderListBo>)findPage("selectSettlementByPage","selectSettlementCount", params, pageNo, pageSize);

+ 0 - 1
src/main/resources/shiro_base_auth.ini

@@ -19,7 +19,6 @@
 /portal/**=anon
 /api/portal/**=anon
 /api/admin/**=admin
-/api/user/partner/**=anon
 /api/user/**=login
 /admin/**=admin
 /role/**=admin,permission

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

@@ -142,7 +142,7 @@
 							<p>合作电话:400-8800-962</p>
 						</div>
 						<div class="cont_guanli">
-							<a href="http://www.jishutao.com/admin/login">
+							<a th:href="${basePath + '/admin/login'}">
 								<img th:src="${portalHost+'/img/guanli.png'}" alt="" />
 								<p>管理员入口</p>
 							</a>