| @@ -646,7 +646,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| try { | try { | ||||
| File file = new File(filepath); | File file = new File(filepath); | ||||
| workbook = new SXSSFWorkbook(100); | workbook = new SXSSFWorkbook(100); | ||||
| SXSSFSheet sheetTwo = workbook.createSheet((record.getIsPay()!=null && 1==record.getIsPay())?"线上缴费车辆列表":"进出车辆列表"); | |||||
| String sheetName = (record.getIsPay()!=null && 1==record.getIsPay())?"线上缴费车辆列表":"进出车辆列表"; | |||||
| SXSSFSheet sheetTwo = workbook.createSheet(sheetName); | |||||
| Row rowtwo = sheetTwo.createRow(0); | Row rowtwo = sheetTwo.createRow(0); | ||||
| Cell cell1 = rowtwo.createCell(0); | Cell cell1 = rowtwo.createCell(0); | ||||
| Cell cell2 = rowtwo.createCell(1); | Cell cell2 = rowtwo.createCell(1); | ||||
| @@ -686,7 +687,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| workbook.write(fileOut); | workbook.write(fileOut); | ||||
| fileOut.close(); | fileOut.close(); | ||||
| workbook.close(); | workbook.close(); | ||||
| downFile(filepath, filename,(record.getIsPay()!=null && 1==record.getIsPay())?"线上缴费车辆数据":"进出车辆数据"+".xlsx",response, request); | |||||
| String name = (record.getIsPay()!=null && 1==record.getIsPay())?"线上缴费车辆数据":"进出车辆数据"; | |||||
| downFile(filepath, filename,name+".xlsx",response, request); | |||||
| FileUtils.forceDelete(file); | FileUtils.forceDelete(file); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| e.printStackTrace(); | e.printStackTrace(); | ||||
| @@ -180,6 +180,9 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| @Override | @Override | ||||
| public ResultData getTaskStatusList(Long businessId, String tenantId) { | public ResultData getTaskStatusList(Long businessId, String tenantId) { | ||||
| List<WxFlowRecord> resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); | List<WxFlowRecord> resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); | ||||
| if(CollectionUtils.isEmpty(resultList)){ | |||||
| return new ResultData(); | |||||
| } | |||||
| String processInstanceId = resultList.get(0).getProcessInstanceId(); | String processInstanceId = resultList.get(0).getProcessInstanceId(); | ||||
| ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); | ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); | ||||
| Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); | Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); | ||||
| @@ -201,7 +204,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); | wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); | ||||
| resultList.add(0,wxFlowRecord); | resultList.add(0,wxFlowRecord); | ||||
| if(i != taskAssigneeList.size()-1){ //不是最后一个节点,设置下一个待审批节点代办人 | |||||
| //不是最后一个节点,设置下一个待审批节点代办人 | |||||
| if(i != taskAssigneeList.size()-1){ | |||||
| assignee = taskAssigneeList.get(i+1); | assignee = taskAssigneeList.get(i+1); | ||||
| assigneeArray = assignee.get("assignee").split(","); | assigneeArray = assignee.get("assignee").split(","); | ||||
| userName = ""; | userName = ""; | ||||
| @@ -28,9 +28,6 @@ | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and `id` = #{id} | and `id` = #{id} | ||||
| </if> | </if> | ||||
| <if test=" null != tenantId "> | |||||
| and `tenant_id` like concat('%', #{tenantId},'%') | |||||
| </if> | |||||
| <if test=" null != businessId "> | <if test=" null != businessId "> | ||||
| and `business_id` = #{businessId} | and `business_id` = #{businessId} | ||||
| </if> | </if> | ||||