Browse Source

修改导出,其他改为导出其他加括号里显示说明

anderx 1 year ago
parent
commit
95d12bafcf

+ 17 - 45
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -359,12 +358,10 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 我的工时列表导出xls
-	 * @throws IOException
 	 */
 	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
 	public Result exportMyTaskList(inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
 		if(pageSize==null)pageSize=999999;
-		@SuppressWarnings("unchecked")
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderProjectService.taskHoursList(ib,  pageNo, pageSize).getList();
 		NewExcelUtil<TOrderTaskListBo> excel=new NewExcelUtil<>(TOrderTaskListBo.class);
 		return excel.exportExcel(list, "工时信息记录表",uploadPath);
@@ -372,13 +369,11 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 我的任务列表导出xls
-	 * @throws IOException
 	 */
 	@RequestMapping(value = "/exporProjectList", method = RequestMethod.GET)
 	public Result exporProjectList(HttpServletResponse response,inuptTaskListBo ib) {
 		if(ib.getPageSize()==null)ib.setPageSize(99999);
 		String str="项目任务列表";
-		@SuppressWarnings("unchecked")
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderProjectService.orderTaskList(ib).getList();
 		list.forEach(e->{
 				if(e.getType()!=null) {
@@ -407,8 +402,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 	项目日志 (转交日志)
-	 * @param tid
-	 * @return
 	 */
 	@RequestMapping(value = "/taskAttributionLog",method = RequestMethod.GET)
 	public Result taskAttributionLog(Integer tid) {
@@ -422,7 +415,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	}
 	/**
 	 * 	客户项目列表
-	 * @return
 	 */
 	@RequestMapping(value = "/selectUidByproject",method = RequestMethod.GET)
 	public Result selectUidByproject(String uid) {
@@ -437,8 +429,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 	发起项目核对
-	 * @param tid
-	 * @return
 	 */
 	@RequestMapping(value = "/addProjectCheck",method = RequestMethod.POST)
 	public Result addProjectCheck(Integer tid) {
@@ -453,8 +443,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 	核对日志
-	 * @param tid
-	 * @return
 	 */
 	@RequestMapping(value = "/projectCheckLog",method = RequestMethod.GET)
 	public Result projectCheckLog(Integer tid) {
@@ -469,7 +457,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 	获取专利分类
-	 * @return
 	 */
 	@RequestMapping(value = "/getPatentType",method = RequestMethod.GET)
 	public Result getPatentType() {
@@ -480,7 +467,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 	核对列表
-	 * @return
 	 */
 	@RequestMapping(value = "/selectProjectCheck",method = RequestMethod.GET)
 	public Result selectProjectCheck(InputProjectCheck in) {
@@ -506,9 +492,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	public Result highNewRetrialStatisticsExport(String depId,String startDate,String endDate,String depName) {
 		List<OutHighNewRetrialStatistics>  list=orderProjectService.highNewRetrialStatistics(depId,startDate,endDate);
 		NewExcelUtil<OutHighNewRetrialStatistics> newExcelUtil=new NewExcelUtil<>(OutHighNewRetrialStatistics.class);
-		StringBuffer str=new StringBuffer("搜索条件=》");
-		if (depName!=null)str=str.append("部门:").append(depName).append(",");
-		if (startDate!=null&&endDate!=null)str=str.append("时间:").append(startDate).append("~").append(endDate).append(",");
+		StringBuilder str=new StringBuilder("搜索条件=》");
+		if (depName!=null)str.append("部门:").append(depName).append(",");
+		if (startDate!=null&&endDate!=null)str.append("时间:").append(startDate).append("~").append(endDate).append(",");
 		return newExcelUtil.exportExcel(list,"高新复审统计",uploadPath,str.substring(0,str.toString().length()-1));
 	}
 
@@ -527,23 +513,21 @@ public class OrderProjectApiController extends CertifyApiController {
 										   String aName,Integer sort) {
 		List<OutHighNewRetrialList>  list=orderProjectService.highNewRetrialList(province,depId,aid,sort,startDate,endDate);
 		NewExcelUtil<OutHighNewRetrialList> newExcelUtil=new NewExcelUtil<>(OutHighNewRetrialList.class);
-		StringBuffer str=new StringBuffer("搜索条件=》");
-		if (provinceName!=null)str=str.append("省份:").append(provinceName).append(",");
-		if (depName!=null)str=str.append("部门:").append(depName).append(",");
-		if (aName!=null)str=str.append("跟进人:").append(aName).append(",");
-		if (startDate!=null&&endDate!=null)str=str.append("时间:").append(startDate).append("~").append(endDate).append(",");
+		StringBuilder str=new StringBuilder("搜索条件=》");
+		if (provinceName!=null)str.append("省份:").append(provinceName).append(",");
+		if (depName!=null)str.append("部门:").append(depName).append(",");
+		if (aName!=null)str.append("跟进人:").append(aName).append(",");
+		if (startDate!=null&&endDate!=null)str.append("时间:").append(startDate).append("~").append(endDate).append(",");
 		if(sort!=null){
-			str=str.append("排序:");
-			if(sort==0)str=str.append("按签通过高新排序");
-			else if(sort==1)str=str.append("按未通过高新排序");
+			str.append("排序:");
+			if(sort==0)str.append("按签通过高新排序");
+			else if(sort==1)str.append("按未通过高新排序");
 		}
 		return newExcelUtil.exportExcel(list,"高新复审详情",uploadPath,str.substring(0,str.toString().length()-1));
 	}
 
 	/**
 	 * 新增会员项目
-	 * @param t
-	 * @return
 	 */
 	@RequestMapping(value = "/addMemberProject" ,method = RequestMethod.POST)
 	public Result addMemberProject(InputAddTask t){
@@ -560,8 +544,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 会员项目审核
-	 * @param in
-	 * @return
 	 */
 	@RequestMapping(value = "/examineMemberProject" ,method = RequestMethod.POST)
 	public Result examineMemberProject(InputMenber in){
@@ -576,8 +558,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 会员项目修改
-	 * @param t
-	 * @return
 	 */
 	@RequestMapping(value = "/updateMemberProject" ,method = RequestMethod.POST)
 	public Result updateMemberProject(InputAddTask t){
@@ -592,8 +572,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 会员项目列表
-	 * @param in
-	 * @return
 	 */
 	@RequestMapping(value = "/memberList" ,method = RequestMethod.GET)
 	public Result memberList(InputMemberList in){
@@ -603,7 +581,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 会员项目列表
-	 * @return
 	 */
 	@RequestMapping(value = "/memberLog" ,method = RequestMethod.GET)
 	public Result memberLog(Integer id){
@@ -614,8 +591,6 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	/**
 	 * 会员项目列表
-	 * @param in
-	 * @return
 	 */
 	@RequestMapping(value = "/memberList/export" ,method = RequestMethod.GET)
 	public Result memberListExport(InputMemberList in){
@@ -636,7 +611,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	/**
 	 * 新增会员子项目(发起新增、无需审核)
 	 *
-	 * @return
 	 */
 	@RequestMapping(value = "/addMemberFirstSonProject" ,method = RequestMethod.POST)
 	public Result addMemberFirstSonProject(Integer tid,String serviceYear,String taskComment){
@@ -655,7 +629,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	/**
 	 * 新增会员子项目(审核)
 	 *
-	 * @return
 	 */
 	@RequestMapping(value = "/addMemberSonProject" ,method = RequestMethod.POST)
 	public Result addMemberSonProject(Integer tid,String serviceYear,String taskComment,Integer memberType,String pictureUrl){
@@ -671,7 +644,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	/**
 	 * 删除会员子项目
 	 *
-	 * @return
 	 */
 	@RequestMapping(value = "/deleteMemberSonProject" ,method = RequestMethod.POST)
 	public Result deleteMemberSonProject(Integer id){
@@ -779,18 +751,18 @@ public class OrderProjectApiController extends CertifyApiController {
 			for (OutselectProjectSotp use : list) {
 				OutselectProjectSotpBo o = new OutselectProjectSotpBo();
 				BeanUtils.copyProperties(use,o);
-				StringBuffer str =new StringBuffer();
+				StringBuilder str =new StringBuilder();
 				if (o.getStopStatus()==0){
-					str=str.append("已发起");
+					str.append("已发起");
 				}else if (o.getStopStatus()==1){
-					str=str.append("已完成");
+					str.append("已完成");
 				}else if (o.getStopStatus()==2){
-					str=str.append("已拒绝");
+					str.append("已拒绝");
 				}
 				if (o.getStopType()==0){
-					str=str.append("暂停");
+					str.append("暂停");
 				}else if (o.getStopStatus()==1){
-					str=str.append("重启");
+					str.append("重启");
 				}
 				o.setStatusName(str.toString());
 				list2.add(o);