bonus
/
ah_jjzhgd_service
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2026-01-23 14:55:40 +08:00
parent c5ce7f32bf 4a88d4abbd
commit 196c25159c
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjNewConstructionProgressController.java
View File

@ -23,7 +23,7 @@ public class SjNewConstructionProgressController extends BaseController {
* 施工进度分析列表 * 施工进度分析列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(@RequestBody SjNewConstructionProgress progress) { public TableDataInfo list( SjNewConstructionProgress progress) {
startPage(); startPage();
List<SjNewConstructionProgress> list = List<SjNewConstructionProgress> list =
progressService.selectConstructionProgressList(progress); progressService.selectConstructionProgressList(progress);
@ -34,7 +34,7 @@ public class SjNewConstructionProgressController extends BaseController {
* 查询专业工序整体进度 * 查询专业工序整体进度
*/ */
@GetMapping("/summary") @GetMapping("/summary")
public AjaxResult getProgressSummary(@RequestBody SjNewConstructionProgress progress) { public AjaxResult getProgressSummary( SjNewConstructionProgress progress) {
return AjaxResult.success( return AjaxResult.success(
progressService.getProgressSummary(progress) progressService.getProgressSummary(progress)
); );
@ -44,7 +44,7 @@ public class SjNewConstructionProgressController extends BaseController {
* 工序明细查询（点击汇总进入） * 工序明细查询（点击汇总进入）
*/ */
@GetMapping("/detail") @GetMapping("/detail")
public AjaxResult getProgressDetail(@RequestBody SjNewConstructionProgress progress) { public AjaxResult getProgressDetail( SjNewConstructionProgress progress) {
System.out.println( System.out.println(
"queryType=[" + progress.getQueryType() + "], length=" + "queryType=[" + progress.getQueryType() + "], length=" +
(progress.getQueryType() == null ? 0 : progress.getQueryType().length()) (progress.getQueryType() == null ? 0 : progress.getQueryType().length())

4
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjNewHjjcAnalysisController.java
View File

@ -24,7 +24,7 @@ public class SjNewHjjcAnalysisController {
* @return 环境检测数据列表 * @return 环境检测数据列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public AjaxResult getAnalysisList(@RequestBody SjNewHjjcAnalysis analysis) { public AjaxResult getAnalysisList( SjNewHjjcAnalysis analysis) {
List<SjNewHjjcAnalysis> list = analysisService.getAnalysisByDateRange(analysis.getProjectId(), analysis.getStartTime(), analysis.getEndTime()); List<SjNewHjjcAnalysis> list = analysisService.getAnalysisByDateRange(analysis.getProjectId(), analysis.getStartTime(), analysis.getEndTime());
return AjaxResult.success(list); return AjaxResult.success(list);
@ -36,7 +36,7 @@ public class SjNewHjjcAnalysisController {
* @return 环境检测数据列表 * @return 环境检测数据列表
*/ */
@GetMapping("/warnlist") @GetMapping("/warnlist")
public AjaxResult warnlist(@RequestBody SjNewHjjcAnalysis analysis) { public AjaxResult warnlist( SjNewHjjcAnalysis analysis) {
List<SjNewHjjcAnalysis> list = analysisService.getwarnlist(analysis.getProjectId(), analysis.getStartTime(), analysis.getEndTime()); List<SjNewHjjcAnalysis> list = analysisService.getwarnlist(analysis.getProjectId(), analysis.getStartTime(), analysis.getEndTime());
return AjaxResult.success(list); return AjaxResult.success(list);

8
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjNewQualityController.java
View File

@ -31,7 +31,7 @@ public class SjNewQualityController extends BaseController {
* 工程质量分析列表 * 工程质量分析列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(@RequestBody SjNewProjectQuality quality) { public TableDataInfo list(SjNewProjectQuality quality) {
startPage(); startPage();
List<SjNewProjectQuality> list = qualityService.selectQualityList(quality); List<SjNewProjectQuality> list = qualityService.selectQualityList(quality);
return getDataTable(list); return getDataTable(list);
@ -41,7 +41,7 @@ public class SjNewQualityController extends BaseController {
* 质量预警列表 * 质量预警列表
*/ */
@GetMapping("/warnlist") @GetMapping("/warnlist")
public TableDataInfo warnList( @RequestBody SjNewAsyncWarn warn) { public TableDataInfo warnList( SjNewAsyncWarn warn) {
startPage(); startPage();
warn.setDataType("1"); // 质量类型 warn.setDataType("1"); // 质量类型
List<SjNewAsyncWarn> list = qualityService.selectWarnList(warn); List<SjNewAsyncWarn> list = qualityService.selectWarnList(warn);
@ -52,7 +52,7 @@ public class SjNewQualityController extends BaseController {
* 1️⃣ 班组合格率 * 1️⃣ 班组合格率
*/ */
@GetMapping("/teamRate") @GetMapping("/teamRate")
public AjaxResult teamRate(@RequestBody SjNewProjectQuality quality) { public AjaxResult teamRate(SjNewProjectQuality quality) {
return AjaxResult.success(qualityService.teamPassRate(quality)); return AjaxResult.success(qualityService.teamPassRate(quality));
} }
@ -61,7 +61,7 @@ public class SjNewQualityController extends BaseController {
* 2️⃣ 合格 / 不合格数量 * 2️⃣ 合格 / 不合格数量
*/ */
@GetMapping("/resultCount") @GetMapping("/resultCount")
public AjaxResult resultCount(@RequestBody SjNewProjectQuality quality) { public AjaxResult resultCount(SjNewProjectQuality quality) {
return AjaxResult.success(qualityService.resultCount(quality)); return AjaxResult.success(qualityService.resultCount(quality));
} }

10
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjNewWorkerAnalysisController.java
View File

@ -24,7 +24,7 @@ public class SjNewWorkerAnalysisController extends BaseController {
* @return 各状态任务数量 * @return 各状态任务数量
*/ */
@GetMapping("/summary") @GetMapping("/summary")
public AjaxResult summary(@RequestBody WorkerTaskSummaryVO vo) { public AjaxResult summary( WorkerTaskSummaryVO vo) {
return AjaxResult.success( return AjaxResult.success(
workerTaskAnalysisService.selectTaskSummary(vo) workerTaskAnalysisService.selectTaskSummary(vo)
); );
@ -37,7 +37,7 @@ public class SjNewWorkerAnalysisController extends BaseController {
* - 支持时间范围过滤 * - 支持时间范围过滤
*/ */
@GetMapping("/detail") @GetMapping("/detail")
public TableDataInfo detail(@RequestBody WorkerTaskSummaryVO vo) { public TableDataInfo detail( WorkerTaskSummaryVO vo) {
startPage(); startPage();
return getDataTable( return getDataTable(
workerTaskAnalysisService.selectTaskDetail(vo) workerTaskAnalysisService.selectTaskDetail(vo)
@ -51,7 +51,7 @@ public class SjNewWorkerAnalysisController extends BaseController {
* 李四 延期 3 次 * 李四 延期 3 次
*/ */
@GetMapping("/delay/person") @GetMapping("/delay/person")
public AjaxResult delayRankByPerson(@RequestBody WorkerTaskSummaryVO vo) { public AjaxResult delayRankByPerson( WorkerTaskSummaryVO vo) {
return AjaxResult.success( return AjaxResult.success(
workerTaskAnalysisService.selectDelayRankByPerson(vo) workerTaskAnalysisService.selectDelayRankByPerson(vo)
@ -65,14 +65,14 @@ public class SjNewWorkerAnalysisController extends BaseController {
* 电工 30% * 电工 30%
*/ */
@GetMapping("/delay/workType") @GetMapping("/delay/workType")
public AjaxResult delayDistributionByWorkType( @RequestBody WorkerTaskSummaryVO vo) { public AjaxResult delayDistributionByWorkType( WorkerTaskSummaryVO vo) {
return AjaxResult.success( return AjaxResult.success(
workerTaskAnalysisService.selectDelayDistributionByWorkType(vo) workerTaskAnalysisService.selectDelayDistributionByWorkType(vo)
); );
} }
@GetMapping("/yujingdetail") @GetMapping("/yujingdetail")
public AjaxResult getWarnDetailByMonth(@RequestBody WorkerWarnVO vo) { public AjaxResult getWarnDetailByMonth( WorkerWarnVO vo) {
return AjaxResult.success( return AjaxResult.success(
workerTaskAnalysisService.selectWarnDetailByMonth(vo.getStartTime()) workerTaskAnalysisService.selectWarnDetailByMonth(vo.getStartTime())
); );