|
@@ -1614,6 +1614,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
} else {
|
|
|
//删除日报的日志
|
|
|
reportLogMapper.delete(new QueryWrapper<ReportLog>().eq("creator_id", userId).eq("create_date", date));
|
|
|
+ reportLogDetailMapper.delete(new QueryWrapper<ReportLogDetail>().in("report_id", collect));
|
|
|
//存入日报删除表
|
|
|
List<ReportDelete> delList = new ArrayList<>();
|
|
|
for (Report r : reportList) {
|
|
@@ -1625,26 +1626,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
}
|
|
|
reportDeleteService.saveBatch(delList);
|
|
|
}
|
|
|
- //不需要调绎维的删除接口了。工时在我们这边系统内管理控制。
|
|
|
-// if(company.getId()==862){
|
|
|
-// String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billRejected";
|
|
|
-// HttpHeaders headers = new HttpHeaders();
|
|
|
-// headers.setContentType(MediaType.APPLICATION_JSON);
|
|
|
-// headers.add("token",getTokenOfYiWei());
|
|
|
-// JSONObject body=new JSONObject();
|
|
|
-// body.put("type","EXPENSE");
|
|
|
-// body.put("billNo","GS"+reportList.get(0).getCreatorId()+reportList.get(0).getCreateDate());
|
|
|
-// HttpEntity<String> requestEntity = new HttpEntity<String>(body.toJSONString(), headers);
|
|
|
-// ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
|
|
|
-// HttpMethod.POST, requestEntity, String.class);
|
|
|
-// if (responseEntity.getStatusCode() == HttpStatus.OK) {
|
|
|
-// String resp = responseEntity.getBody();
|
|
|
-// JSONObject json = JSONObject.parseObject(resp);
|
|
|
-// if(json.getIntValue("status")==0){
|
|
|
-// JSONArray jsonArray = json.getJSONArray("data");
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
return httpRespMsg;
|
|
|
}
|
|
|
|