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

Merge branch 'test' of http://git.jishutao.com/jishutao/kede-server.git into test

limin лет назад: 7
Родитель
Сommit
3022de091a

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

@@ -102,7 +102,7 @@ public interface TOrderDunMapper {
 
 	List<TOrderDun> selectByOrderNoDunSubject(String orderNo);
 
-	List<TOrderNewBo> getOrderDunData(@Param("name")String name,@Param("orderNo") String orderNo, @Param("starTime")String starTime, @Param("endTime")String endTime);
+	List<TOrderNewBo> getOrderDunData(@Param("name")String name,@Param("orderNo") String orderNo,@Param("adminName") String adminName,@Param("depId") String depId, @Param("starTime")String starTime, @Param("endTime")String endTime);
 
 	List<OrderDunTaskBo> getTaskAllOrderDun();
 

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

@@ -370,18 +370,26 @@
     where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
   </select>
   <select id="getOrderDunData" resultType="com.goafanti.order.bo.TOrderNewBo">
-  select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
+select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
     c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,
     b.project_status as projectStatus,b.liquidation_status as liquidationStatus,
     b.settlement_amount as settlementAmount,d.name as salesmanName,a.dun_subject as dunSubject,
-    date_format(a.start_time, '%Y-%m-%d') as startDate
+    date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,
+    a.money as accountsReceivable,(a.money-b.settlement_amount) as uncollectedAmount
     from t_order_dun 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 dep on d.department_id=dep.id
     where a.start_time is not null and b.delete_sign = 0
     <if test="name != null and name != ''">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
+  		<if test="adminName != null">
+  	and d.name  like CONCAT('%',#{adminName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="depId != null">
+  	and dep.id= #{depId,jdbcType=VARCHAR}
+  	</if>
   	<if test="orderNo != null and orderNo != ''">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>

+ 24 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1094,7 +1094,7 @@
   	select 
   		a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,
   		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,d.name as financeName
+  		a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,dep.name as depName,d.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>
@@ -1103,6 +1103,7 @@
   	</if>
   	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 c.department_id=dep.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
@@ -1133,7 +1134,7 @@
   	and a.approval = 1 and  a.order_status=2
   	</if>
   	<if test="specially == 4">
-  	and a.process_status in (4,5,6)
+  	and a.process_status in (4,5,6,99)
   	and a.order_status not in(5,7)
   	</if>
   	<if test="specially == 5">
@@ -1157,6 +1158,9 @@
   	<if test="orderNo != null">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="depId != null">
+  	and dep.id = #{depId,jdbcType=VARCHAR}
+  	</if>
   	<if test="starTime !=null and endTime !=null">
   	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
@@ -1242,17 +1246,26 @@
     c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,
     b.project_status as projectStatus,b.liquidation_status as liquidationStatus,
     b.settlement_amount as settlementAmount,d.name as salesmanName,a.dun_subject as dunSubject,
-    date_format(a.start_time, '%Y-%m-%d') as startDate
+    date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,
+    a.money as accountsReceivable,(a.money-b.settlement_amount) as uncollectedAmount
     from t_order_dun 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 dep on d.department_id=dep.id
     where a.start_time is not null and b.delete_sign = 0
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
+  	<if test="adminName != null">
+  	and d.name  like CONCAT('%',#{adminName,jdbcType=VARCHAR},'%')
+  	</if>
+  	
   	<if test="orderNo != null">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="depId != null">
+  	and dep.id= #{depId,jdbcType=VARCHAR}
+  	</if>
   	<if test="starTime !=null and endTime !=null">
   	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
@@ -1271,6 +1284,12 @@
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
+  	<if test="adminName != null">
+  	and d.name  like CONCAT('%',#{adminName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="depId != null">
+  	and dep.id= #{depId,jdbcType=VARCHAR}
+  	</if>
   	<if test="orderNo != null">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
@@ -1286,11 +1305,12 @@
     a.project_status as projectStatus, a.approval, a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, finance_id as financeId, technician_id as technicianId, 
     a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts, a.contact_mobile as contactMobile, 
     a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
-    c.name as salesmanName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
+    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
     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 c.department_id=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
   	left join admin f on e.initiate=f.id

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

@@ -653,7 +653,7 @@
   	select 
   		a.id,a.order_no as orderNo,a.commodity_name as commodityName,a.commodity_id as commodityId,
   		a.commodity_quantity as commodityQuantity,a.commodity_price as commodityPrice,a.task_comment as taskComment,
-  		a.task_status as taskStatus,a.project_status as project_status,a.main,a.task_receiver as taskReceiver ,
+  		a.task_status as taskStatus,a.project_status as projectStatus,a.main,a.task_receiver as taskReceiver ,
   		d.name as contacts,d.contact_mobile as contactsMobile,c.cname
   	 from t_order_task a left join business_project b on a.commodity_id=b.id
   	 left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
@@ -765,11 +765,12 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   </select>
   
    <select id="selectTaskHoursListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,
     a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity
   	from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id
+    left join department dep on d.department_id=dep.id 
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id

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

@@ -321,11 +321,12 @@
     where b.super_id=#{id,jdbcType=VARCHAR}
   </select>
   <select id="getTaskHoursData" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+  select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,
     a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity
   	from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id
+    left join department dep on d.department_id=dep.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id

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

@@ -400,7 +400,6 @@ public class ExportExcelUtil {
 					//当前列的只
 					String o ;
 					switch (comment[i]) {
-					//"订单编号","签单时间","客户名称","订单状态","签单金额","项目状态","结算状态","已收款","订单负责人","催收科目","催款启动日期"
 					case "订单编号": o = ob.getOrderNo(); break;
 					case "签单时间": o = ob.getSignDate(); break;
 					case "客户名称": o = ob.getUserName(); break;
@@ -408,7 +407,10 @@ public class ExportExcelUtil {
 					case "签单金额(万元)": o = ob.getTotalAmount().toString(); break;
 					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
 					case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
+					case "应收款(万元)": o = ob.getAccountsReceivable().toString(); break;
 					case "已收款(万元)": o = ob.getSettlementAmount().toString(); break;
+					case "未收款(万元)": o = ob.getUncollectedAmount().toString(); break;
+					case "订单部门": o =ob.getDepName(); break;
 					case "订单负责人": o =ob.getSalesmanName(); break;
 					case "催收科目": o = getDunSuBubject(ob.getDunSubject()); break;
 					case "催款启动日期": o = ob.getStartDate(); break;
@@ -465,6 +467,7 @@ public class ExportExcelUtil {
 					case "任务名称": o = ob.getTaskName(); break;
 					case "订单编号": o = ob.getOrderNo(); break;
 					case "业务别类": o = ob.getCname();break;
+					case "订单部门": o = ob.getDepName();break;
 					case "客户名称": o = ob.getUserName(); break;
 					case "任务负责人": o = ob.getReceiverName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;

+ 27 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -24,6 +24,9 @@ public class TOrderNewBo extends TOrderNew{
 	private String backId;
 	private String uid;
 	private String email;
+	private String depName;
+	private String accountsReceivable;
+	private String uncollectedAmount;
 	
 	public String getSignDate() {
 		if (StringUtils.isBlank(signDate)&&super.getSignTime()!=null) {
@@ -178,5 +181,29 @@ public class TOrderNewBo extends TOrderNew{
 	public void setBackId(String backId) {
 		this.backId = backId;
 	}
+
+	public String getDepName() {
+		return depName;
+	}
+
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+
+	public String getAccountsReceivable() {
+		return accountsReceivable;
+	}
+
+	public void setAccountsReceivable(String accountsReceivable) {
+		this.accountsReceivable = accountsReceivable;
+	}
+
+	public String getUncollectedAmount() {
+		return uncollectedAmount;
+	}
+
+	public void setUncollectedAmount(String uncollectedAmount) {
+		this.uncollectedAmount = uncollectedAmount;
+	}
 	
 }

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

@@ -12,6 +12,7 @@ public class TOrderTaskListBo {
 	private String taskDate;
 	private Integer commodityQuantity;
 	private String hours;
+	private String depName;
 	public String getId() {
 		return id;
 	}
@@ -78,5 +79,11 @@ public class TOrderTaskListBo {
 	public void setHours(String hours) {
 		this.hours = hours;
 	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
 	
 }

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

@@ -237,9 +237,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单列表
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer distribution,Integer pageNo,Integer pageSize){
+	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer distribution,String depId,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution, pageNo, pageSize));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution,depId, pageNo, pageSize));
 		return res;
 	}
 	
@@ -269,9 +269,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 催款统计列表
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
-	public Result dunOrderNewList(String name,String orderNo,String starTime,String endTime,Integer specially,Integer pageNo,Integer pageSize){
+	public Result dunOrderNewList(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,String depId,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.dunOrderNewList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
+		res.data(orderNewService.dunOrderNewList(name, orderNo, starTime, endTime,specially,  adminName, depId,pageNo, pageSize));
 		return res;
 	}
 	/**
@@ -440,9 +440,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
-	public Result exportOrderDunData(String name,String orderNo,String starTime,String endTime,HttpServletResponse response) throws IOException{
+	public Result exportOrderDunData(String name,String orderNo,String adminName,String depId,String starTime,String endTime,HttpServletResponse response) throws IOException{
 		 Result res = new Result();
-		 XSSFWorkbook wb = orderNewService.exportOrderDunData( name, orderNo, starTime, endTime);
+		 XSSFWorkbook wb = orderNewService.exportOrderDunData( name, orderNo, adminName, depId, starTime, endTime);
 		 if(null == wb){
 			 res.getError().add(buildError("", "没有找到数据"));
 			 return res;

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

@@ -84,7 +84,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,String depId,Integer pageNo, Integer pageSize);
 	/**
 	 * 订单审核
 	 * @param orderNo
@@ -104,7 +104,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime, Integer specially,
+	Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime, Integer specially,String adminName,String depId,
 			Integer pageNo, Integer pageSize);
 	/**
 	 * 新增催款记录
@@ -155,7 +155,7 @@ public interface OrderNewService {
 	int deleteOrderNew(String orderNo);
 	boolean checkOderSettlementAmount(String orderNo);
 	boolean checkORderTask(String orderNo);
-	XSSFWorkbook exportOrderDunData(String name, String orderNo, String starTime, String endTime);
+	XSSFWorkbook exportOrderDunData(String name, String orderNo,String adminName,String depId, String starTime, String endTime);
 	int updateOrderOver(String orderNo);
 	OrderRefundDetailBo orderRefundDetail(String id);
 	int updateOrderRefund(TOrderRefundWithBLOBs t);

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

@@ -273,12 +273,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer distribution, Integer pageNo,
+	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer distribution,String depId, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		if (specially!=null&&(specially==0||specially==1||specially==2||specially==5)) {
+		if (specially!=null&&(specially==0||specially==1||specially==2||specially==4||specially==5)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
 			if (specially!=3&&specially!=4) {
 				params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
@@ -290,6 +290,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 			params.put("specially",specially);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
@@ -343,11 +344,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
-			Integer specially, Integer pageNo, Integer pageSize) {
+			Integer specially, String adminName,String depId,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
@@ -542,13 +545,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 */
 	@SuppressWarnings("null")
 	@Override
-	public XSSFWorkbook exportOrderDunData(String name, String orderNo, String starTime, String endTime) {
+	public XSSFWorkbook exportOrderDunData(String name, String orderNo,String adminName,String depId, String starTime, String endTime) {
 		if(endTime!=null) endTime=endTime+" 23:59:59";
-		List<TOrderNewBo> list=tOrderDunMapper.getOrderDunData(name,orderNo,starTime,endTime);
+		List<TOrderNewBo> list=tOrderDunMapper.getOrderDunData(name,orderNo, adminName, depId,starTime,endTime);
 		if (list==null && list.size()==0) {
 			return null;
 		}
-		String[] comment = {"订单编号","签单时间","客户名称","订单状态","签单金额(万元)","项目状态","结算状态","已收款(万元)","订单负责人","催收科目","催款启动日期"};
+		String[] comment = {"订单编号","签单时间","客户名称","订单状态","签单金额(万元)","项目状态","结算状态","应收款(万元)","已收款(万元)","未收款(万元)","订单部门","订单负责人","催收科目","催款启动日期"};
 		String filePath = uploadPath + "/OrderDun";
 		XSSFWorkbook wb = ExportExcelUtil.exportOrderDunData(list, comment, filePath);
 		return wb;

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

@@ -239,12 +239,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskHoursListByPage", "selectTaskHoursListCount", params, pageNo, pageSize);
-		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
+		/*List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
 		for (TOrderTaskListBo t : list) {
 			if (t.getCommodityQuantity()!=null&&t.getCommodityQuantity()>1) {
 				t.setHours(tTaskHoursMapper.getTaskSuperHours(t.getId()));
 			}
-		}
+		}*/
 		return p;
 	}
 
@@ -256,7 +256,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (list==null && list.size()==0) {
 			return null;
 		}
-		String[] comment = {"任务编号","任务名称","订单编号","业务别类","客户名称","任务负责人","任务状态","工时"};
+		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时"};
 		String filePath = uploadPath + "/TaskHours";
 		XSSFWorkbook wb = ExportExcelUtil.exportTaskHoursListData(list, comment, filePath);
 		return wb;

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

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://192.168.0.14\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://192.168.0.2\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.0.14
+jedis.host=192.168.0.2
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456