|
|
@@ -28,7 +28,7 @@ import com.goafanti.weChat.service.PublicReleaseService;
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/release")
|
|
|
public class AdminReleaseApiController extends CertifyApiController{
|
|
|
-
|
|
|
+
|
|
|
@Resource
|
|
|
private PublicReleaseService publicReleaseService;
|
|
|
|
|
|
@@ -36,7 +36,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
private String uploadPath = null;
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 发起外出申请
|
|
|
*/
|
|
|
@@ -59,11 +59,11 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.getError().add(buildError("公出时段已经被使用!","公出时段已经被使用!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
res.setData(publicReleaseService.addPublicRelease(in));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 修改外出申请
|
|
|
* @return
|
|
|
@@ -71,7 +71,10 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
@RequestMapping(value = "/updatePublicRelease", method = RequestMethod.POST)
|
|
|
public Result updatePublicRelease(InputPublicRelease in){
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+ if (publicReleaseService.checkTime(in)) {
|
|
|
+ res.getError().add(buildError("公出时段已经被使用!","公出时段已经被使用!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
res.setData(publicReleaseService.updatePublicRelease(in));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -96,8 +99,8 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.setData(publicReleaseService.dtails(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 外出申请详情
|
|
|
* @return
|
|
|
@@ -108,7 +111,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.setData(publicReleaseService.followDtails(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 外出申请列表
|
|
|
* @return
|
|
|
@@ -119,7 +122,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.setData(publicReleaseService.listPublicRelease(in));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 外出审核
|
|
|
* @return
|
|
|
@@ -142,7 +145,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.setData(publicReleaseService.pushExaminePublicRelease( id , status, remarks,duration));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 外出审核日志列表
|
|
|
* @return
|
|
|
@@ -153,9 +156,9 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.data(publicReleaseService.listPublicReleaseLog(id,ufid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 公出统计
|
|
|
* @return
|
|
|
@@ -166,7 +169,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.data(publicReleaseService.publicReleaseStatistics(in));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 公出统计导出
|
|
|
* @return
|
|
|
@@ -177,8 +180,8 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
NewExcelUtil<OutPublicStatistics>excel=new NewExcelUtil<>(OutPublicStatistics.class);
|
|
|
return excel.exportExcel(list,"公出统计列表",response);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 公出详情列表
|
|
|
* @return
|
|
|
@@ -189,7 +192,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.data(publicReleaseService.publicReleaseListDtails(in));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 公出详情列表
|
|
|
* @return
|
|
|
@@ -200,7 +203,7 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
NewExcelUtil<OutPublicDtails>excel=new NewExcelUtil<>(OutPublicDtails.class);
|
|
|
return excel.exportExcel(list,"公出详细列表",uploadPath);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 上传图片 **/
|
|
|
@RequestMapping(value = "/upload", method = RequestMethod.POST)
|
|
|
public Result uploadOrderInvoiceFile(HttpServletRequest req){
|
|
|
@@ -259,6 +262,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
res.data(publicReleaseService.publicByOrder(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|