|
|
@@ -67,7 +67,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 修改外出申请、修改公出
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/updatePublicRelease", method = RequestMethod.POST)
|
|
|
public Result updatePublicRelease(InputPublicRelease in){
|
|
|
@@ -86,8 +85,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 修改打卡地址
|
|
|
- * @param in
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/updateLocation", method = RequestMethod.POST)
|
|
|
public Result updateLocation(InputPublicRelease in){
|
|
|
@@ -106,22 +103,25 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 外出打卡、公出打卡
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/publicReleaseClockIn", method = RequestMethod.POST)
|
|
|
public Result publicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks,String uid ){
|
|
|
Result res =new Result();
|
|
|
- Integer x=publicReleaseService.pushPublicReleaseClockIn(id,photoUrl,clockIn,clockInRemarks,uid);
|
|
|
+ int x=publicReleaseService.pushPublicReleaseClockIn(id,photoUrl,clockIn,clockInRemarks,uid);
|
|
|
if (x==-1){
|
|
|
res.getError().add(buildError("公出他人企业!需通过审核,才可以打卡!"));
|
|
|
return res;
|
|
|
}
|
|
|
+// 取消打卡限制
|
|
|
+// if (x==-2){
|
|
|
+// res.getError().add(buildError("已超过合同规定时限,需审核通过,才可打卡!"));
|
|
|
+// return res;
|
|
|
+// }
|
|
|
res.setData(x);
|
|
|
return res;
|
|
|
}
|
|
|
/**
|
|
|
* 外出申请详情
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/dtails", method = RequestMethod.GET)
|
|
|
public Result dtails(Integer id){
|
|
|
@@ -133,7 +133,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 外出申请详情
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/followDtails", method = RequestMethod.GET)
|
|
|
public Result followDtails(String id){
|
|
|
@@ -144,7 +143,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 外出申请列表.公出列表
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/listPublicRelease", method = RequestMethod.GET)
|
|
|
public Result listPublicRelease(InputPublicReleaseList in){
|
|
|
@@ -155,7 +153,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 公出审核、外出审核 上级
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/examinePublicRelease", method = RequestMethod.POST)
|
|
|
public Result examinePublicRelease(Integer id ,Integer status,String remarks){
|
|
|
@@ -178,10 +175,9 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 公出审核、外出审核 营销
|
|
|
- * @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/MarketersExamine", method = RequestMethod.POST)
|
|
|
- public Result MarketersExamine(Integer id ,Integer status,String remarks){
|
|
|
+ @RequestMapping(value = "/marketersExamine", method = RequestMethod.POST)
|
|
|
+ public Result marketersExamine(Integer id ,Integer status,String remarks){
|
|
|
Result res =new Result();
|
|
|
if (id==null) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));
|
|
|
@@ -200,9 +196,28 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @RequestMapping(value = "/techExamine", method = RequestMethod.POST)
|
|
|
+ public Result techExamine(Integer id ,Integer status,String remarks){
|
|
|
+ Result res =new Result();
|
|
|
+ if (id==null) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (status!=0&&status!=2) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"审核状态"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (remarks.length()>20) {
|
|
|
+ res.getError().add(buildError("备注长度不能超过20个字符。"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,2));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 咨询驳回
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/techReject", method = RequestMethod.POST)
|
|
|
public Result techReject(Integer id ,String remarks){
|
|
|
@@ -223,7 +238,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 外出审核日志列表
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/listPublicReleaseLog", method = RequestMethod.GET)
|
|
|
public Result listPublicReleaseLog(Integer id,String ufid){
|
|
|
@@ -236,7 +250,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 公出统计
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/publicReleaseStatistics", method = RequestMethod.GET)
|
|
|
public Result publicReleaseStatistics(InputPublicStatistics in){
|
|
|
@@ -247,19 +260,17 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 公出统计导出
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/publicReleaseStatistics/export", method = RequestMethod.GET)
|
|
|
public Result publicReleaseStatisticsExport(InputPublicStatistics in,HttpServletResponse response){
|
|
|
List<OutPublicStatistics> list =publicReleaseService.publicReleaseStatisticsList(in);
|
|
|
- NewExcelUtil<OutPublicStatistics>excel=new NewExcelUtil<>(OutPublicStatistics.class);
|
|
|
+ NewExcelUtil<OutPublicStatistics>excel=new NewExcelUtil<>(OutPublicStatistics.class);
|
|
|
return excel.exportExcel(list,"公出统计列表",response);
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 公出详情列表
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/publicReleaseDtails", method = RequestMethod.GET)
|
|
|
public Result publicReleaseListDtails(InputPublicDtails in){
|
|
|
@@ -278,16 +289,15 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 公出详情列表
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/publicReleaseDtails/export", method = RequestMethod.GET)
|
|
|
public Result publicReleaseListDtailsExport(InputPublicDtails in ,Integer exportType){
|
|
|
if (exportType==null)exportType=0;
|
|
|
List<OutPublicDtails> outList=publicReleaseService.publicReleaseListDtailsList(in);
|
|
|
+ publicReleaseService.pushOutPublicDtails(outList);
|
|
|
if (exportType==0){
|
|
|
- List<OutPublicDtails> list=outList;
|
|
|
- NewExcelUtil<OutPublicDtails>excel=new NewExcelUtil<>(OutPublicDtails.class);
|
|
|
- return excel.exportExcel(list,"公出详细列表",uploadPath);
|
|
|
+ NewExcelUtil<OutPublicDtails>excel=new NewExcelUtil<>(OutPublicDtails.class);
|
|
|
+ return excel.exportExcel(outList,"公出详细列表",uploadPath);
|
|
|
}else if (exportType==1){
|
|
|
List<OutPublicDtailsFinance> list = new ArrayList<>();
|
|
|
for (OutPublicDtails outPublicDtails : outList) {
|
|
|
@@ -315,7 +325,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 搜索
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/addSupplement", method = RequestMethod.POST)
|
|
|
public Result addSupplement(Integer id,String supplement,String nextPlan){
|
|
|
@@ -366,7 +375,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
|
|
|
/**
|
|
|
* 打卡页面获取自己最新的打卡
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getMyNewPublic",method = RequestMethod.GET)
|
|
|
public Result getMyNewPublic (){
|
|
|
@@ -379,7 +387,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
* 新增协单助手
|
|
|
* @param id 公出编号
|
|
|
* @param aid 协单助手编号
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/addAssistant",method = RequestMethod.POST)
|
|
|
public Result addAssistant (Integer id,String aid){
|
|
|
@@ -400,7 +407,6 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
* 删除协单助手
|
|
|
* @param id 公出编号
|
|
|
* @param aid 协单助手编号
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/deleteAssistant",method = RequestMethod.POST)
|
|
|
public Result deleteAssistant (Integer id,String aid){
|
|
|
@@ -418,5 +424,25 @@ public class AdminReleaseApiController extends CertifyApiController{
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 技术发起公出查询发起情况
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/checkOrderNoDuration",method = RequestMethod.GET)
|
|
|
+ public Result checkOrderNoDuration (InputPublicRelease in){
|
|
|
+ Result res =new Result();
|
|
|
+ return res.data(publicReleaseService.checkOrderNoDuration(in));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 技术发起公出查询发起情况
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/pushDateClock",method = RequestMethod.POST)
|
|
|
+ public Result pushDateClock (){
|
|
|
+ Result res =new Result();
|
|
|
+ return res.data(publicReleaseService.pushDateClock());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}
|