|
|
@@ -32,12 +32,12 @@ import com.goafanti.order.service.OrderProjectService;
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/orderProject")
|
|
|
public class OrderProjectApiController extends CertifyApiController {
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private OrderProjectService orderProjectService;
|
|
|
@Value(value = "${upload.path}")
|
|
|
private String uploadPath = null;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 项目分配
|
|
|
* taskId 项目ID
|
|
|
@@ -60,14 +60,15 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError("角色不正确,请勿在浏览器登录多个账号!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
res.setData(orderProjectService.updateProjectDistribution( taskId, taskReceiverId,remarks,type));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 任务派单列表 我的任务,我的外包任务
|
|
|
* specially 0我的任务 1任务派单
|
|
|
+ * 我的任务不看父项目,只看子项目 ,任务派单子项目父项目都会存在
|
|
|
*/
|
|
|
@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
|
|
|
public Result orderTaskList(inuptTaskListBo ib){
|
|
|
@@ -75,8 +76,8 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.orderTaskList(ib));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 任务派单查询
|
|
|
*/
|
|
|
@@ -86,9 +87,9 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially , depId ,pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 经理查询订单
|
|
|
*/
|
|
|
@@ -101,8 +102,8 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 经理查询订单
|
|
|
*/
|
|
|
@@ -111,13 +112,13 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
String depId,String techDepId ,Integer declarationBatch ,String commodityPrice,String startTime,
|
|
|
String endTime,Integer pageNo,Integer pageSize){
|
|
|
@SuppressWarnings("unchecked")
|
|
|
- List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
|
+ List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
|
cid, projectType,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
|
|
|
NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
|
|
|
return excel.exportExcel(list, "企业项目查询列表", uploadPath);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 任务详情
|
|
|
*/
|
|
|
@@ -201,8 +202,8 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.taskHoursDetailsList(taskId));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 任务操作日志
|
|
|
*/
|
|
|
@@ -231,7 +232,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.createTaskProgress(t));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 修改项目申报进度
|
|
|
*/
|
|
|
@@ -244,7 +245,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.updateTaskProgress(t));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除项目申报进度
|
|
|
*/
|
|
|
@@ -269,7 +270,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.selectTaskProgress(tid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 项目申报进度日志
|
|
|
*/
|
|
|
@@ -300,7 +301,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(i);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 拆分项目列表
|
|
|
*/
|
|
|
@@ -314,12 +315,12 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.setData(orderProjectService.splitProjectList(tid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 我的工时列表导出xls
|
|
|
- * @throws IOException
|
|
|
+ * @throws IOException
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
|
|
|
public Result exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
|
|
|
@@ -329,10 +330,10 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
NewExcelUtil<TOrderTaskListBo> excel=new NewExcelUtil<>(TOrderTaskListBo.class);
|
|
|
return excel.exportExcel(list, "工时信息记录表", response);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 我的任务列表导出xls
|
|
|
- * @throws IOException
|
|
|
+ * @throws IOException
|
|
|
*/
|
|
|
@RequestMapping(value = "/exporProjectList", method = RequestMethod.GET)
|
|
|
public Result exporProjectList(HttpServletResponse response,inuptTaskListBo ib) {
|
|
|
@@ -343,7 +344,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
NewExcelUtil<TOrderTaskListBo>excel=new NewExcelUtil<>(TOrderTaskListBo.class);
|
|
|
return excel.exportExcel(list, str, response);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 项目日志 (转交日志)
|
|
|
* @param tid
|
|
|
@@ -373,7 +374,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.data( orderProjectService.selectUidByproject(uid) );
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 发起项目核对
|
|
|
* @param tid
|
|
|
@@ -389,7 +390,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.data( orderProjectService.addProjectCheck(tid) );
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 核对日志
|
|
|
* @param tid
|
|
|
@@ -405,7 +406,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.data( orderProjectService.projectCheckLog(tid) );
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 获取专利分类
|
|
|
* @return
|
|
|
@@ -416,7 +417,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
res.data(OfficialPatentType.getStatus());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 核对列表
|
|
|
* @return
|
|
|
@@ -478,8 +479,8 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
}
|
|
|
return newExcelUtil.exportExcel(list,"高新复审详情",uploadPath,str.substring(0,str.toString().length()-1));
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|