wanghui 8 anni fa
parent
commit
901a71585a

+ 38 - 13
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1026,9 +1026,6 @@
 		<if test="endDate != null">
 			and a.create_time &lt; #{endDate,jdbcType=TIMESTAMP}
 		</if>
-		<if test="buyerName != null and buyerName != ''">
-			and b.nickname = #{buyerName,jdbcType=VARCHAR}
-		</if>
 		<if test="orderStatus != null">
 			and a.order_status = #{orderStatus,jdbcType=INTEGER}
 		</if>
@@ -1044,6 +1041,12 @@
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="buyerName != null and buyerName != ''">
+			and b.nickname = #{buyerName,jdbcType=VARCHAR}
+		</if>
+		<if test="salesmanName != null and salesmanName != ''">
+			and c.name = #{salesmanName,jdbcType=VARCHAR}
+		</if>
 		<!-- 特殊处理字段 开始 -->
 		<if test="intention == 1">
 			and a.order_stage = 0
@@ -1091,9 +1094,6 @@
 		<if test="endDate != null">
 			and a.create_time &lt; #{endDate,jdbcType=VARCHAR}
 		</if>
-		<if test="buyerName != null and buyerName != ''">
-			and b.nickname = #{buyerName,jdbcType=VARCHAR}
-		</if>
 		<if test="orderStatus != null">
 			and a.order_status = #{orderStatus,jdbcType=INTEGER}
 		</if>
@@ -1110,11 +1110,17 @@
 			and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
 		</if>
 		<if test="orderChannel != null">
-			and.order_channel =#{orderChannel,jdbcType=INTEGER}
+			and a.order_channel =#{orderChannel,jdbcType=INTEGER}
 		</if>
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="buyerName != null and buyerName != ''">
+			and b.nickname = #{buyerName,jdbcType=VARCHAR}
+		</if>
+		<if test="salesmanName != null and salesmanName != ''">
+			and c.name = #{salesmanName,jdbcType=VARCHAR}
+		</if>
 		<!-- 特殊处理字段 开始 -->
 		<if test="intention == 1">
 			and a.order_stage = 0
@@ -1373,6 +1379,9 @@
 		b.salesman_id = f.id left join department_management g on
 		f.department_id = g.id
 	where 1=1
+	<if test="orderNo != null and orderNo != ''">
+		and b.order_no = #{orderNo,jdbcType=VARCHAR}
+	</if>
 	<if test="payeeName != null and payeeName != ''">
 		and c.nickname = #{payeeName,jdbcType=VARCHAR}
 	</if>
@@ -1421,6 +1430,9 @@
 		b.salesman_id = f.id left join department_management g on
 		f.department_id = g.id
 	where 1=1
+	<if test="orderNo != null and orderNo != ''">
+		and b.order_no = #{orderNo,jdbcType=VARCHAR}
+	</if>
 	<if test="payeeName != null and payeeName != ''">
 		and c.nickname = #{payeeName,jdbcType=VARCHAR}
 	</if>
@@ -1527,15 +1539,22 @@
 		<if test="endDate != null">
 			and a.create_time &lt; #{a.endDate,jdbcType=TIMESTAMP}
 		</if>
-		<if test="buyerName != null and buyerName != ''">
-			and b.nickname = #{buyerName,jdbcType=VARCHAR}
-		</if>
+		
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
 		<if test="depId != null and depId != ''">
 			and f.id = #{depId,jdbcType=VARCHAR}
 		</if>
+		<if test="buyerName != null and buyerName != ''">
+			and b.nickname = #{buyerName,jdbcType=VARCHAR}
+		</if>
+		<if test="salesmanName != null and salesmanName != ''">
+			and c.name = #{salesmanName,jdbcType=VARCHAR}
+		</if>
+		<if test="financeName != null and financeName != ''">
+			and d.name = #{financeName,jdbcType=VARCHAR}
+		</if>
 		<if test="page_sql != null">
 			${page_sql}
 		</if>
@@ -1567,15 +1586,21 @@
 		<if test="endDate != null">
 			and a.create_time &lt; #{a.endDate,jdbcType=TIMESTAMP}
 		</if>
-		<if test="buyerName != null and buyerName != ''">
-			and b.nickname = #{buyerName,jdbcType=VARCHAR}
-		</if>
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
 		<if test="depId != null and depId != ''">
 			and f.id = #{depId,jdbcType=VARCHAR}
 		</if>
+		<if test="buyerName != null and buyerName != ''">
+			and b.nickname = #{buyerName,jdbcType=VARCHAR}
+		</if>
+		<if test="salesmanName != null and salesmanName != ''">
+			and c.name = #{salesmanName,jdbcType=VARCHAR}
+		</if>
+		<if test="financeName != null and financeName != ''">
+			and d.name = #{financeName,jdbcType=VARCHAR}
+		</if>
 		<if test="page_sql != null">
 			${page_sql}
 		</if>

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

@@ -567,13 +567,13 @@
 	select
 		a.id,
 		a.serial_number as serialNumber,
-		a.sign_date as signDate,
+		date_format(a.sign_date,'%Y-%m-%d %H:%i:%S') as signDate,
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as projectTime,
 		a.uid,
 		a.status as projectStatus,
 		a.deleted_sign as deleteSign,
 		a.order_no as orderNo,
 		a.type as projectType,
-		a.create_time as projectTime,
 		b.nickname as buyerName,
 		c.create_time as orderTime,
 		c.order_status as orderStatus,

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

@@ -817,6 +817,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	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());
+		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate +" 00:00:00");
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate + "23:59:59");
 		if(bo.getOrderStatus() != null) params.put("orderStatus", bo.getOrderStatus());
@@ -879,6 +880,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setApproval(Integer.valueOf(approval));
 			tOrder.setUpdateTime(signTime);
 			tOrder.setSignTime(signTime);
+			tOrder.setOrderRemarks(orderRemarks);
 			tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		}
 		return 1;
@@ -1123,8 +1125,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setBrokerageAmount(initial);
 		tOrder.setFirstPayment(initial);
 		tOrder.setOrderAmount(initial);
+		tOrder.setSignBrokerageAmount(initial);
+		tOrder.setSignFirstPayment(initial);
+		tOrder.setSignTotalAmount(initial);
+		tOrder.setSignWithdrawAmount(initial);
 		tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());	
-		tOrder.setOrderRemarks("");
 		tOrder.setDeleteSign(ActiveState.NORMAL.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
@@ -1179,13 +1184,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	public Pagination<BillListBo> selectMyBillList(String payeeName, String payerName, String depId,
 			String salesmanName,String orderNo, Integer confirmSign,Integer deleteSign, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
+		if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
 		if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
 		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
 		if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if(confirmSign != null) params.put("confirmSign", confirmSign);
-		if(confirmSign != null) params.put("deleteSign", deleteSign);
+		if(deleteSign != null) params.put("deleteSign", deleteSign);
 		/** 特殊处理字段开始 **/
 		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
 			params.put("isFinance", 1);

+ 6 - 8
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -607,9 +607,9 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/listProject",method = RequestMethod.POST)
 	public Result listProject(ProjectListBo bo,String depId,
-			String orderStartTime,String orderEndTime,String setUpStartDate,String setUpEndDate,Integer pageNo,Integer pageSize){
+			String orderStartDate,String orderEndDate,String setUpStartDate,String setUpEndDate,Integer pageNo,Integer pageSize){
 		Result res = new Result();
-		res.setData(techProjectService.listProject(bo, depId, orderStartTime, orderEndTime, setUpStartDate, setUpEndDate,pageNo,pageSize));
+		res.setData(techProjectService.listProject(bo, depId, orderStartDate, orderEndDate, setUpStartDate, setUpEndDate,pageNo,pageSize));
 		return res;
 	}
 	
@@ -625,12 +625,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/createProject",method = RequestMethod.POST)
 	public Result createProject(String uid,String aid,Integer projectType,String signComment){
 		Result res = new Result();
-		if(StringUtils.isBlank(aid)){
-			if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || projectType==null){
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "客户和项目负责人"));
-				return res;
-			} 
-		}
+		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || projectType==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "客户和项目负责人"));
+			return res;
+		} 
 		techProjectService.createProject(uid, aid, signComment);
 		return res;
 	}

+ 16 - 11
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -311,25 +311,30 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if(bo.getDeleteSign() != null) params.put("deleteSign", bo.getDeleteSign());
 		if(bo.getOrderNo() != null) params.put("orderNo", bo.getOrderNo());
 		if(bo.getSalesmanName() != null) params.put("salesmanName", bo.getSalesmanName());
-		if(StringUtils.isNotBlank(setUpStartDate))
-			try {
-				params.put("setUpStartDate", DateUtils.parseDate(setUpStartDate, AFTConstants.YYYYMMDDHHMMSS));
-				params.put("setUpEndDate", DateUtils.parseDate(setUpEndDate, AFTConstants.YYYYMMDDHHMMSS));
-				params.put("orderStartDate", DateUtils.parseDate(orderStartDate, AFTConstants.YYYYMMDDHHMMSS));
-				params.put("orderEndDate", DateUtils.parseDate(orderEndDate, AFTConstants.YYYYMMDDHHMMSS));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
+		try {
+			if(StringUtils.isNotBlank(setUpStartDate))
+				params.put("setUpStartDate", DateUtils.parseDate(setUpStartDate, AFTConstants.YYYYMMDD));
+			if(StringUtils.isNotBlank(setUpEndDate))
+				params.put("setUpEndDate", DateUtils.parseDate(setUpEndDate, AFTConstants.YYYYMMDD));
+			if(StringUtils.isNotBlank(orderStartDate))
+				params.put("orderStartDate", DateUtils.parseDate(orderStartDate, AFTConstants.YYYYMMDD));
+			if(StringUtils.isNotBlank(orderEndDate))
+				params.put("orderEndDate", DateUtils.parseDate(orderEndDate, AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
 		return (Pagination<ProjectListBo>)findPage("listProjectByPage", "listProjectCount", params, pageNo, pageSize);
 	}
 
 	@Override
 	public int createProject(String uid, String aid, String signComment) {
 		Contract contract = new Contract();
+		Date signDate = new Date();
 		contract.setId(UUID.randomUUID().toString());
 		contract.setStatus(ProjectStage.ALREADY_SET_UP.getCode());
 		contract.setSignComment(signComment);
-		contract.setCreateTime(new Date());
+		contract.setCreateTime(signDate);
+		contract.setSignDate(signDate);
 		contract.setType(CommodityType.SERVICE.getTypeCode());
 		contract.setUid(uid);
 		contract.setCreater(TokenManager.getAdminId());
@@ -389,7 +394,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if(StringUtils.isNotBlank(projectNo)) params.put("projectNo", projectNo);
 		if(StringUtils.isNotBlank(buyerName)) params.put("buyerName", buyerName);
 		if(StringUtils.isNotBlank(taskReceiverId)) params.put("taskReceiverId", taskReceiverId);
-		if(StringUtils.isNotBlank(taskReceiverName)) params.put("taskReceiverName", categoryId);
+		if(StringUtils.isNotBlank(taskReceiverName)) params.put("taskReceiverName", taskReceiverName);
 		try {
 			if (StringUtils.isNotBlank(startDate))
 				params.put("startDate", DateUtils.parseDate(startDate + " 00:00:00", AFTConstants.YYYYMMDDHHMMSS));