提交代码

dev_xds
姜玉琦 2024-03-03 23:34:35 +08:00
parent c9743faf84
commit feb864da4a
5 changed files with 18 additions and 18 deletions

View File

@ -62,7 +62,7 @@ public class ProjectTrainController extends BaseController {
* @return * @return
*/ */
@PostMapping("/addTrain") @PostMapping("/addTrain")
@Log(title = "专项培训", businessType = BusinessType.INSERT) @Log(title = "教育培训", businessType = BusinessType.INSERT)
public AjaxResult addTrain(@RequestBody WorkTrain workTrain){ public AjaxResult addTrain(@RequestBody WorkTrain workTrain){
return success(workTrainService.insertWorkTrain(workTrain)); return success(workTrainService.insertWorkTrain(workTrain));
} }
@ -81,7 +81,7 @@ public class ProjectTrainController extends BaseController {
/** /**
* *
*/ */
@Log(title = "专项培训", businessType = BusinessType.DELETE) @Log(title = "教育培训", businessType = BusinessType.DELETE)
@GetMapping("/removeTrain") @GetMapping("/removeTrain")
public AjaxResult removeTrain(@RequestParam Long id) public AjaxResult removeTrain(@RequestParam Long id)
{ {

View File

@ -350,7 +350,7 @@ public class ProjectViewController extends BaseBuildNodeController{
tempCell.setCellStyle(headerStyle); tempCell.setCellStyle(headerStyle);
tempCell = tempRow.createCell(17); tempCell = tempRow.createCell(17);
tempCell.setCellValue("专项培训"); tempCell.setCellValue("教育培训");
tempCell.setCellStyle(headerStyle); tempCell.setCellStyle(headerStyle);
tempCell = tempRow.createCell(18); tempCell = tempRow.createCell(18);
@ -392,7 +392,7 @@ public class ProjectViewController extends BaseBuildNodeController{
tempCell.setCellStyle(headerStyle); tempCell.setCellStyle(headerStyle);
tempCell = tempRow.createCell(27); tempCell = tempRow.createCell(27);
tempCell.setCellValue("延迟摄影"); tempCell.setCellValue("项目全景");
tempCell.setCellStyle(headerStyle); tempCell.setCellStyle(headerStyle);
tempCell = tempRow.createCell(28); tempCell = tempRow.createCell(28);

View File

@ -40,7 +40,7 @@ public class ProjectViewExport implements Serializable {
@Excel(name = "应急演练", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) @Excel(name = "应急演练", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
private String yjyl; private String yjyl;
@Excel(name = "专项培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) @Excel(name = "教育培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
private String zxpx; private String zxpx;
@Excel(name = "质量隐患-甲方经理", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) @Excel(name = "质量隐患-甲方经理", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)

View File

@ -25,7 +25,7 @@ public class ProjectViewJlExport implements Serializable {
@Excel(name = "应急演练", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) @Excel(name = "应急演练", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
private String yjyl; private String yjyl;
@Excel(name = "专项培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) @Excel(name = "教育培训", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)
private String zxpx; private String zxpx;
@Excel(name = "质量隐患-监理单位", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true) @Excel(name = "质量隐患-监理单位", width = 20,align = HorizontalAlignment.CENTER, isStatistics = true)

View File

@ -22,7 +22,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
/** /**
* Controller * Controller
* *
* @author ruoyi * @author ruoyi
* @date 2023-10-15 * @date 2023-10-15
@ -35,7 +35,7 @@ public class SurProjectPhotographyController extends BaseController
private ISurProjectPhotographyService surProjectPhotographyService; private ISurProjectPhotographyService surProjectPhotographyService;
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('video:prjphotography:list')") @PreAuthorize("@ss.hasPermi('video:prjphotography:list')")
@GetMapping("/list") @GetMapping("/list")
@ -47,20 +47,20 @@ public class SurProjectPhotographyController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('video:prjphotography:export')") @PreAuthorize("@ss.hasPermi('video:prjphotography:export')")
@Log(title = "项目延时摄影", businessType = BusinessType.EXPORT) @Log(title = "项目全景", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, SurProjectPhotography surProjectPhotography) public void export(HttpServletResponse response, SurProjectPhotography surProjectPhotography)
{ {
List<SurProjectPhotography> list = surProjectPhotographyService.selectSurProjectPhotographyList(surProjectPhotography); List<SurProjectPhotography> list = surProjectPhotographyService.selectSurProjectPhotographyList(surProjectPhotography);
ExcelUtil<SurProjectPhotography> util = new ExcelUtil<SurProjectPhotography>(SurProjectPhotography.class); ExcelUtil<SurProjectPhotography> util = new ExcelUtil<SurProjectPhotography>(SurProjectPhotography.class);
util.exportExcel(response, list, "项目延时摄影数据"); util.exportExcel(response, list, "项目全景数据");
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('video:prjphotography:query')") @PreAuthorize("@ss.hasPermi('video:prjphotography:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@ -70,10 +70,10 @@ public class SurProjectPhotographyController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('video:prjphotography:add')") @PreAuthorize("@ss.hasPermi('video:prjphotography:add')")
@Log(title = "项目延时摄影", businessType = BusinessType.INSERT) @Log(title = "项目项目全景", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SurProjectPhotography surProjectPhotography) public AjaxResult add(@RequestBody SurProjectPhotography surProjectPhotography)
{ {
@ -81,10 +81,10 @@ public class SurProjectPhotographyController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('video:prjphotography:edit')") @PreAuthorize("@ss.hasPermi('video:prjphotography:edit')")
@Log(title = "项目延时摄影", businessType = BusinessType.UPDATE) @Log(title = "项目项目全景", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SurProjectPhotography surProjectPhotography) public AjaxResult edit(@RequestBody SurProjectPhotography surProjectPhotography)
{ {
@ -92,10 +92,10 @@ public class SurProjectPhotographyController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('video:prjphotography:remove')") @PreAuthorize("@ss.hasPermi('video:prjphotography:remove')")
@Log(title = "项目延时摄影", businessType = BusinessType.DELETE) @Log(title = "项目项目全景", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
{ {