|
@@ -45,8 +45,9 @@ public class PersonWorkController {
|
|
|
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "beginTime", value = "开始时间yyyy-MM-dd", required = true, paramType = "query", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "endTime", value = "开始时间yyyy-MM-dd", required = true, paramType = "query", dataType = "String"),
|
|
|
+ @ApiImplicitParam(name = "id", value = "报工id", paramType = "query", dataType = "String"),
|
|
|
})
|
|
|
- public MessageResult getAvailableDateInfo(@RequestHeader("token") String token, String beginTime,String endTime) {
|
|
|
+ public MessageResult getAvailableDateInfo(@RequestHeader("token") String token, String beginTime,String endTime,String id) {
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
if (StringUtils.isEmpty(number)) {
|
|
|
return MessageResult.error("token异常");
|
|
@@ -58,8 +59,15 @@ public class PersonWorkController {
|
|
|
}else if (isValid== 2){
|
|
|
return MessageResultV2.error("开始时间不能大于结束时间");
|
|
|
}
|
|
|
+ List<Map<String,Object>> list = null;
|
|
|
+ if(StrUtil.isNotBlank(id)){
|
|
|
+ list =personWorkService.getAvailableDateInfoById(number,id,beginTime,endTime);
|
|
|
+ }else{
|
|
|
+ list = personWorkService.getAvailableDateInfo(number,beginTime,endTime);
|
|
|
+ }
|
|
|
MessageResultV2 result = MessageResultV2.success();
|
|
|
- result.setData(personWorkService.getAvailableDateInfo(number,beginTime,endTime));
|
|
|
+ result.setData(list);
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
|
|
@@ -68,21 +76,22 @@ public class PersonWorkController {
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
|
|
|
})
|
|
|
- public MessageResultV2 insertWork(@RequestHeader("token") String token, @RequestBody WorkHoursReport jobWork) {
|
|
|
+ public MessageResult insertWork(@RequestHeader("token") String token, @RequestBody WorkHoursReport jobWork) {
|
|
|
try {
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
if (StringUtils.isEmpty(number)) {
|
|
|
- return MessageResultV2.error("token异常");
|
|
|
+ return MessageResult.error("token异常");
|
|
|
}
|
|
|
+
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
String beginTime = jobWork.getBeginTime();
|
|
|
String endTime = jobWork.getEndTime();
|
|
|
if (StrUtil.isBlank(beginTime)) {
|
|
|
- return MessageResultV2.error("开始时间结束时间不能为空");
|
|
|
+ return MessageResult.error("开始时间结束时间不能为空");
|
|
|
}
|
|
|
if ( StrUtil.isBlank(endTime)) {
|
|
|
- return MessageResultV2.error("结束始时间结束时间不能为空");
|
|
|
+ return MessageResult.error("结束始时间结束时间不能为空");
|
|
|
}
|
|
|
|
|
|
Integer Hours = 0;
|
|
@@ -101,7 +110,12 @@ public class PersonWorkController {
|
|
|
map.put("beginDateStr",beginTime);
|
|
|
map.put("endDateStr",endTime);
|
|
|
//校验报工日期是否超过8小时
|
|
|
- List<Map<String,Object>> availableList = personWorkService.getAvailableDateInfo(number,beginTime,endTime);
|
|
|
+ List<Map<String,Object>> availableList = null;
|
|
|
+ if(StrUtil.isBlank(jobWork.getId())) {
|
|
|
+ availableList = personWorkService.getAvailableDateInfo(number, beginTime, endTime);
|
|
|
+ }else{
|
|
|
+ availableList = personWorkService.getAvailableDateInfoById(number,jobWork.getId(), beginTime, endTime);
|
|
|
+ }
|
|
|
Map<String,Map<String,Object>> availableMap = Maps.newHashMap();
|
|
|
for(Map<String,Object> objectMap : availableList){
|
|
|
String date = (String) objectMap.get("date");
|
|
@@ -145,7 +159,7 @@ public class PersonWorkController {
|
|
|
}
|
|
|
}
|
|
|
if (Hours > 8) {
|
|
|
- return MessageResultV2.error("报工小时数不能大于8小时");
|
|
|
+ return MessageResult.error("报工小时数不能大于8小时");
|
|
|
}
|
|
|
if (errMsg.length() > 0) {
|
|
|
MessageResultV2 result = new MessageResultV2();
|
|
@@ -153,16 +167,28 @@ public class PersonWorkController {
|
|
|
result.setMsg(errMsg.toString());
|
|
|
return result;
|
|
|
}
|
|
|
- Map<String,Object> objectMap = personWorkService.insertWork(map);
|
|
|
- if("2".equals(jobWork.getState())){
|
|
|
- List<Map<String, Object>> billList = (List<Map<String, Object>>) objectMap.get("billList");
|
|
|
- for(Map<String, Object> stringObjectMap:billList) {
|
|
|
- String id = (String) stringObjectMap.get("id");
|
|
|
- int i = personWorkService.submitWork(number, id);
|
|
|
+ MessageResult resultV2 = MessageResult.success();
|
|
|
+ Map<String,Object> objectMap=null;
|
|
|
+ if(StrUtil.isBlank(jobWork.getId())){
|
|
|
+ objectMap = personWorkService.insertWork(map);
|
|
|
+ }else {
|
|
|
+ int i = personWorkService.deleteWork(number,jobWork.getId());
|
|
|
+ if(i<1){
|
|
|
+ return MessageResult.error("更新失败");
|
|
|
}
|
|
|
+ objectMap = personWorkService.insertWork(map);
|
|
|
+ }
|
|
|
+ if ((boolean)objectMap.get("code")) {
|
|
|
+ if ("2".equals(jobWork.getState())) {
|
|
|
+ List<Map<String, Object>> billList = (List<Map<String, Object>>) objectMap.get("billList");
|
|
|
+ for (Map<String, Object> stringObjectMap : billList) {
|
|
|
+ String id = (String) stringObjectMap.get("id");
|
|
|
+ int i = personWorkService.submitWork(number, id);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ resultV2 = MessageResult.fail((String) objectMap.get("errMsg"));
|
|
|
}
|
|
|
- MessageResultV2 resultV2 = MessageResultV2.success();
|
|
|
- resultV2.setData(objectMap);
|
|
|
return resultV2;
|
|
|
}catch (Exception e){
|
|
|
log.error(e.getMessage(),e);
|
|
@@ -223,31 +249,50 @@ public class PersonWorkController {
|
|
|
return result;
|
|
|
}
|
|
|
@ApiOperation(value = "更新", notes = "更新")
|
|
|
- @RequestMapping(value = "/update", method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/updateWork", method = RequestMethod.POST)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
|
|
|
})
|
|
|
- public MessageResult update(@RequestHeader("token") String token, @RequestBody WorkHoursReport jobWork) {
|
|
|
+ public MessageResult updateWork(@RequestHeader("token") String token, @RequestBody WorkHoursReport jobWork) {
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
+ MessageResult result =MessageResult.success();
|
|
|
if (StringUtils.isEmpty(number)) {
|
|
|
return MessageResult.error("token异常");
|
|
|
}
|
|
|
- int i = personWorkService.deleteWork(number,jobWork.getId());
|
|
|
- MessageResult result = this.insertWork(token,jobWork);
|
|
|
+ String action = jobWork.getAction();
|
|
|
+
|
|
|
+ if("delete".equals(action)){
|
|
|
+ int i = personWorkService.deleteWork(number,jobWork.getId());
|
|
|
+ if(i<1){
|
|
|
+ return MessageResult.error("删除失败");
|
|
|
+ }
|
|
|
+ }else if("revoke".equals(action)){
|
|
|
+ int i = personWorkService.revocaWork(number,jobWork.getId());
|
|
|
+ if(i<1) {
|
|
|
+ result = MessageResult.fail("撤回失败");
|
|
|
+ }
|
|
|
+ }else if("commit".equals(action)){
|
|
|
+ int i = personWorkService.submitWork(number,jobWork.getId());
|
|
|
+ if(i<1) {
|
|
|
+ result = MessageResult.fail("提交失败");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ result=MessageResult.fail("没有找到方法");
|
|
|
+ }
|
|
|
return result;
|
|
|
}
|
|
|
@ApiOperation(value = "删除报工", notes = "删除报工")
|
|
|
- @RequestMapping(value = "/deleteWork", method = RequestMethod.GET)
|
|
|
+ @RequestMapping(value = "/deleteWork", method = RequestMethod.POST)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
|
|
|
- @ApiImplicitParam(name = "id", value = "报工id", required = true, paramType = "query", dataType = "String"),
|
|
|
+
|
|
|
})
|
|
|
- public MessageResult deleteWork(@RequestHeader("token") String token, String id) {
|
|
|
+ public MessageResult deleteWork(@RequestHeader("token") String token, @RequestBody Map<String,String> id) {
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
if (StringUtils.isEmpty(number)) {
|
|
|
return MessageResult.error("token异常");
|
|
|
}
|
|
|
- int i = personWorkService.deleteWork(number,id);
|
|
|
+ int i = personWorkService.deleteWork(number,id.get("id"));
|
|
|
MessageResultV2 result=MessageResultV2.success();
|
|
|
//result.setData(list);
|
|
|
return result;
|
|
@@ -265,7 +310,7 @@ public class PersonWorkController {
|
|
|
return MessageResult.error("token异常");
|
|
|
}
|
|
|
JobBooking list = personWorkService.getPersonWorkInfoById(number,id);
|
|
|
- MessageResultV2 result=MessageResultV2.success();
|
|
|
+ MessageResult result=MessageResult.success();
|
|
|
result.setData(list);
|
|
|
return result;
|
|
|
}
|