Browse Source

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/kede-server.git into test

anderx 7 years ago
parent
commit
bbfa6ba7c3

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

@@ -370,6 +370,7 @@
   		accept_time as acceptTime, review_time as reviewTime, licence_time as licenceTime,
   		o.liquidation_status as liquidationStatus, ga.name as byName,
   		bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
+  		, b.create_time as startTime1
   		from t_order_bonus b
   		left join t_order_task t on b.task_id = t.id
   		left join t_order_new o on o.order_no = t.order_no
@@ -402,6 +403,11 @@
   		<bind name="e" value="b.endTime +'-31'"/>
   		and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   		</if>
+  		<if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
+  		<bind name="a1" value="b.startTime1 +' 00:00:00'"/>
+  		<bind name="e1" value="b.endTime1 +' 23:59:59'"/>
+  		and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+  		</if>
   		order by b.grant_status ,b.create_time 
   		<if test="page_sql != null">
 			${page_sql}
@@ -441,6 +447,11 @@
   		<bind name="e" value="b.endTime +'-31'"/>
   		and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   		</if>
+  		<if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
+  		<bind name="a1" value="b.startTime1 +' 00:00:00'"/>
+  		<bind name="e1" value="b.endTime1 +' 23:59:59'"/>
+  		and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+  		</if>
   </select>
   <!-- 财务专员统计营销员奖金 -->
   <select id="saleBonusList" parameterType="Map" resultType="com.goafanti.order.bo.TOrderBonusBo">
@@ -449,7 +460,7 @@
 	o.first_amount as firstAmount, o.settlement_amount as settlementAmount, o.refund_amount as refundAmount,
 	o.order_status as orderStatus, o.project_status as projectStatus, b.bonus_subject as bonusSubject,
 	o.proof_count as proofCount, b.grant_status as grantStatus, a.name as salesName, o.proof_status as proofStatus,
-	ad.name as byName, b.grant_target as grantTarget
+	ad.name as byName, b.grant_target as grantTarget, b.create_time as startTime1
 	from t_order_bonus b
 	left join t_order_new o on o.order_no = b.order_no
 	left join admin a on o.salesman_id = a.id
@@ -478,6 +489,11 @@
 	<bind name="e" value="b.endTime +'-31'"/>
 	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
 	</if>
+	<if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
+	<bind name="a1" value="b.startTime1 +' 00:00:00'"/>
+	<bind name="e1" value="b.endTime1 +' 23:59:59'"/>
+	and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+	</if>
 	order by b.grant_status , b.create_time desc
 	<if test="page_sql != null">
 		${page_sql}
@@ -512,6 +528,11 @@
 	<bind name="e" value="b.endTime +'-31'"/>
 	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
 	</if>
+	<if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
+	<bind name="a1" value="b.startTime1 +' 00:00:00'"/>
+	<bind name="e1" value="b.endTime1 +' 23:59:59'"/>
+	and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+	</if>
   </select>
   <!-- 获得技术员有奖金数据的部门 -->
   <select id="getDeptBySome" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="com.goafanti.order.bo.TOrderBonusBo">
@@ -541,6 +562,11 @@
  	<bind name="e" value="endTime +'-31'"/>
  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
 	</if>
+	<if test='startTime1 != null and startTime1 != "" and endTime1 != null and endTime1 != ""'>
+	<bind name="a1" value="startTime1 +' 00:00:00'"/>
+	<bind name="e1" value="endTime1 +' 23:59:59'"/>
+	and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+	</if>
   </select>
   <!-- 获得及技术员奖金数据 -->
   <select id="getBonusData" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="com.goafanti.order.bo.TOrderBonusBo">
@@ -549,6 +575,7 @@
   		accept_time as acceptTime, review_time as reviewTime, licence_time as licenceTime,
   		o.liquidation_status as liquidationStatus, ga.name as byName,
   		bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
+  		,b.create_time as startTime1
   		from t_order_bonus b
   		left join t_order_task t on b.task_id = t.id
   		left join t_order_new o on o.order_no = t.order_no
@@ -578,6 +605,11 @@
 	 	<bind name="e" value="endTime +'-31'"/>
 	 	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   		</if>
+  		<if test='startTime1 != null and startTime1 != "" and endTime1 != null and endTime1 != ""'>
+  		<bind name="a1" value="startTime1 +' 00:00:00'"/>
+  		<bind name="e1" value="endTime1 +' 23:59:59'"/>
+  		and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+  		</if>
   		order by b.grant_status ,b.create_time desc
   </select>
   <!-- 查看营销员的奖金数据 -->
@@ -587,7 +619,7 @@
 	o.first_amount as firstAmount, o.settlement_amount as settlementAmount, o.refund_amount as refundAmount,
 	o.order_status as orderStatus, o.project_status as projectStatus, b.bonus_subject as bonusSubject,
 	o.proof_count as proofCount, b.grant_status as grantStatus, a.name as salesName
-	
+	,b.create_time as startTime1
 	from t_order_bonus b
 	left join t_order_new o on o.order_no = b.order_no
 	left join admin a on o.salesman_id = a.id
@@ -611,6 +643,11 @@
 	<bind name="e" value="endTime +'-31'"/>
 	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
 	</if>
+	<if test='startTime1 != null and startTime1 != "" and endTime1 != null and endTime1 != ""'>
+	<bind name="a1" value="startTime1 +' 00:00:00'"/>
+	<bind name="e1" value="endTime1 +' 23:59:59'"/>
+	and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
+	</if>
   </select>
   <!-- 根据订单编号和科目和奖金发放人检查这个奖金是否存在 -->
   <select id="checkByOnoAndSub" parameterType="com.goafanti.common.model.TOrderBonus" resultType="java.lang.Integer">

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

@@ -482,7 +482,7 @@
 	select o.order_type, #{month,jdbcType=INTEGER},sum(o.total_amount), sum(o.proof_count), o.salesman_id 
 	from t_order_new o
 	where 1 = 1
-	  and o.proof_status = 1 o.delete_sign = 0 and o.order_status &lt;&gt; 7
+	  and o.proof_status = 1 and o.delete_sign = 0 and o.order_status &lt;&gt; 7
 	  and date_format( o.sign_time, '%Y%m' ) = #{month,jdbcType=INTEGER}
 	group by o.salesman_id , o.order_type
  </insert>

+ 3 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -278,6 +278,7 @@ public class ExportExcelUtil {
 							o = "已发放";
 						}
 					break;
+					case "奖金创建时间": o = ob.getStartTime1(); break;
 					default: o = ""; break;
 					}
 					XSSFCell c = r.createCell(i);
@@ -521,7 +522,7 @@ public class ExportExcelUtil {
 	 */
 	public static XSSFWorkbook exportDeptBonusInfoS(Map<String,List<TOrderBonusBo>> map){
 		String comment[] = {"订单编号", "订单负责人", "签单日期", "客户名称", "签单金额(万元)", "首付款(万元)", "已收(万元)","已退(万元)","订单状态","项目状态","发放类型",
-							"校对后单量(个)","发放状态","当月认证项目数量","当月科技项目数量","年度认证项目数量","年度科技项目数量"};
+							"校对后单量(个)","发放状态","当月认证项目数量","当月科技项目数量","年度认证项目数量","年度科技项目数量", "奖金创建时间"};
 		//map 数据 ,comment表头 (列名称)
 		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
@@ -579,6 +580,7 @@ public class ExportExcelUtil {
 				r.createCell(14).setCellValue(ob.getKejim());
 				r.createCell(15).setCellValue(ob.getRenzy());
 				r.createCell(16).setCellValue(ob.getRenzy());
+				r.createCell(17).setCellValue(ob.getStartTime1());
 				
 			}
 		}

+ 18 - 0
src/main/java/com/goafanti/order/bo/TOrderBonusBo.java

@@ -44,6 +44,8 @@ public class TOrderBonusBo extends TOrderBonus{
 	private String departmentName; // 部门名称
 	private String startTime;
 	private String endTime;
+	private String startTime1;
+	private String endTime1;
 	
 	private String buyId;
 	private String saleId;
@@ -351,5 +353,21 @@ public class TOrderBonusBo extends TOrderBonus{
 	public void setProofStatus(Integer proofStatus) {
 		this.proofStatus = proofStatus;
 	}
+
+	public String getStartTime1() {
+		return startTime1;
+	}
+
+	public void setStartTime1(String startTime1) {
+		this.startTime1 = startTime1;
+	}
+
+	public String getEndTime1() {
+		return endTime1;
+	}
+
+	public void setEndTime1(String endTime1) {
+		this.endTime1 = endTime1;
+	}
 	
 }

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

@@ -153,7 +153,7 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 		}else{
 			map.put(bonusBo.getDepartmentName(), bonusMapper.getBonusData(bonusBo));
 		}
-		String[] comment = {"任务编号","任务名称","订单编号","任务负责人","任务状态","任务数量","项目状态","受理日期","评审日期","下证日期","订单结算状态","发放类型","发放状态"};
+		String[] comment = {"任务编号","任务名称","订单编号","任务负责人","任务状态","任务数量","项目状态","受理日期","评审日期","下证日期","订单结算状态","发放类型","发放状态","奖金创建时间"};
 		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoT(map, comment);
 		return wb;
 	}