Browse Source

流程修改

anderx 6 years ago
parent
commit
c6fcde1a7a

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

@@ -80,5 +80,5 @@ public interface TTaskHoursMapper {
 
 	List<TOrderTaskListBo> getOrderDunData(String name, String taskId, String starTime, String endTime);
 
-	List<TOrderTaskListBo> getTaskHoursData( @Param("name")String name,  @Param("taskId")String taskId,  @Param("startTime")String startTime,  @Param("endTime")String endTime);
+	List<TOrderTaskListBo> getTaskHoursData( @Param("name")String name,  @Param("taskId")String taskId,  @Param("startTime")String startTime,  @Param("endTime")String endTime,@Param("fid")String fid);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -989,6 +989,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     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
     where e.delete_sign=0 and a.super_id is null
+    <if test="fid != null">
+  	and e.finance_id= #{fid,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -1012,6 +1015,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     where e.delete_sign=0 and a.super_id is null
+    <if test="fid != null">
+  	and e.finance_id= #{fid,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>

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

@@ -332,6 +332,9 @@
     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
     where e.delete_sign=0 and a.super_id is null
+    <if test="fid != null">
+  	and e.finance_id= #{fid,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null and name != ''">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>

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

@@ -119,10 +119,11 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务工时列表
 	 */
 	@RequestMapping(value="/taskHoursList" ,method = RequestMethod.GET)
-	public Result taskHoursList(String name, String taskId ,String starTime,String endTime ,
+	public Result taskHoursList(String name, String taskId ,String starTime,String endTime ,Integer type,
 			Integer pageNo, Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,pageNo, pageSize));
+		//type 1 个人
+		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,type,pageNo, pageSize));
 		return res;
 	}
 	
@@ -184,9 +185,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportTaskHoursListData", method = RequestMethod.GET)
-	public Result exportTaskHoursListData(String name, String taskId ,String starTime,String endTime ,HttpServletResponse response) throws IOException{
+	public Result exportTaskHoursListData(String name, String taskId ,String starTime,String endTime ,Integer type,HttpServletResponse response) throws IOException{
 		 Result res = new Result();
-		 XSSFWorkbook wb = orderProjectService.exportTaskHoursListData( name, taskId, starTime, endTime);
+		 XSSFWorkbook wb = orderProjectService.exportTaskHoursListData( name, taskId, starTime, endTime,type);
 		 if(null == wb){
 			 res.getError().add(buildError("", "没有找到数据"));
 			 return res;

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

@@ -24,10 +24,9 @@ public interface OrderProjectService {
 
 	int addTaskHours(TTaskHours t);
 	
-	Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId,String starTime,String endTime ,
+	Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId,String starTime,String endTime ,Integer type,
 			Integer pageNo, Integer pageSize);
 
-	XSSFWorkbook exportTaskHoursListData(String name, String taskId, String starTime, String endTime);
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
 			Integer specially,String depId  , Integer pageNo, Integer pageSize);
@@ -41,5 +40,7 @@ public interface OrderProjectService {
 	List<TaskProgressBo> selectTaskProgress(Integer tid);
 
 	XSSFWorkbook exportMyTaskList();
+
+	XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime, Integer type);
 	
 }

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

@@ -106,9 +106,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		onew.setOrderNo(orderNo);
 		onew.setDeleteSign(0);//正常
 		onew.setApproval(approval);//特批状态
-		if(approval == ApprovalNewState.FTP.getCode()){
-			onew.setProcessStatus(ProcessStatus.YPCWGLY.getCode());//已派财务管理员
-		}
+		onew.setProcessStatus(ProcessStatus.YPCWGLY.getCode());//已派财务管理员
 		onew.setOrderStatus(OrderNewState.QDSHTG.getCode());//营销管理员审核通过
 		
 		int idCount = tOrderNewMapper.getCountByIdAndStatus(onew);

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

@@ -146,6 +146,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setDeleteSign(0);//0-正常,1-作废,2-锁定
 		t.setSalesmanId(TokenManager.getAdminId());
 		t.setCreater(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
 		t.setCreateTime(new Date());
 		t.setUpdateTime(new Date());
 		t.setBuyerId(uid);

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

@@ -338,7 +338,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId, String starTime,String endTime , Integer pageNo,
+	public Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId, String starTime,String endTime ,Integer type, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -347,6 +347,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
+		if(type!=null&&type==1)params.put("fid", TokenManager.getAdminId());
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskHoursListByPage", "selectTaskHoursListCount", params, pageNo, pageSize);
 		
 		return p;
@@ -354,9 +355,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	
 	@Override
-	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime) {
+	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime,Integer type) {
 		if(StringUtils.isNoneBlank(endTime)) endTime=endTime+" 23:59:59";
-		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime);
+		String fid=null;
+		if(type!=null&&type==1)fid=TokenManager.getAdminId();
+		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime,fid);
 		if (list==null || list.size()==0) return null;
 		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时","合同编号","签单日期","派单日期"};
 		String filePath = uploadPath + "/TaskHours";

+ 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.13
+static.host=//static.jishutao.com/1.1.14
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload