Merge remote-tracking branch 'origin/shoot-hand' into shoot-hand

This commit is contained in:
chenze 2024-08-26 11:26:24 +08:00
commit 4e81a5a514

View File

@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.wf.jwtp.annotation.Ignore;
import org.wf.jwtp.annotation.RequiresPermissions;
import javax.servlet.ServletOutputStream;
@ -51,6 +50,7 @@ import java.util.Date;
import java.util.List;
/**
* 工单导入导出
* created at 2024-8-24 20:48
*
* @author lujiang
@ -67,6 +67,9 @@ public class RepairIOController extends BaseController {
@Autowired
private IRepairService repairService;
// @Autowired
// private IIcsCustomerStaffService customerStaffService;
/**
* 导出工单模板
*/
@ -280,11 +283,17 @@ public class RepairIOController extends BaseController {
return R.ok("成功导入" + count + "条工单数据");
}
@Ignore
//@RequiresPermissions(value = {"repair:manage:operator"})
/**
* 工单导出
* @param startDate 日期范围
* @param endDate 日期范围
*/
@RequiresPermissions(value = {"repair:manage:operator"})
@RequestMapping("/exportRepair")
public void exportData(String startDate, String endDate) {
// Long userId = getLoginStaffId();
// IcsCustomerStaff customerStaff = customerStaffService.selectIcsCustomerStaffById(userId);
// if (!"7".equals(customerStaff.getDataType())) return;//管理员角色验证
Date start, end;
try {
start = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, startDate + " 00:00:00");
@ -298,7 +307,5 @@ public class RepairIOController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
}
}
}