diff --git a/fad-rolling-mill/migration_layer1.js b/fad-rolling-mill/migration_layer1.js new file mode 100644 index 0000000..4f95eaa --- /dev/null +++ b/fad-rolling-mill/migration_layer1.js @@ -0,0 +1,47 @@ +const mysql = require('mysql2/promise'); + +async function run() { + const conn = await mysql.createConnection({ + host: '49.232.154.205', + port: 13306, + user: 'root', + password: 'Root@12345', + database: 'fad_oa_dev' + }); + + console.log('Connected. Running migration...\n'); + + // 1. Add manager_id to fad_rm_project + await conn.execute(` + ALTER TABLE fad_rm_project + ADD COLUMN manager_id BIGINT DEFAULT NULL COMMENT '项目经理用户ID,关联sys_user.user_id' + AFTER manager + `); + console.log('✓ Added manager_id to fad_rm_project'); + + // 2. Create fad_rm_project_member table + await conn.execute(` + CREATE TABLE IF NOT EXISTS fad_rm_project_member ( + member_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '成员ID', + project_id BIGINT NOT NULL COMMENT '项目ID', + user_id BIGINT NOT NULL COMMENT '用户ID', + role VARCHAR(50) DEFAULT 'member' COMMENT '角色: manager/member/viewer', + create_by VARCHAR(64) DEFAULT '' COMMENT '创建者', + create_time DATETIME DEFAULT NULL COMMENT '创建时间', + update_by VARCHAR(64) DEFAULT '' COMMENT '更新者', + update_time DATETIME DEFAULT NULL COMMENT '更新时间', + del_flag INT DEFAULT 0 COMMENT '删除标志', + PRIMARY KEY (member_id), + UNIQUE KEY uk_project_user (project_id, user_id) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目成员表' + `); + console.log('✓ Created fad_rm_project_member table'); + + await conn.end(); + console.log('\nMigration complete!'); +} + +run().catch(err => { + console.error('Migration failed:', err.message); + process.exit(1); +}); diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceChecklistController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceChecklistController.java new file mode 100644 index 0000000..3671e4b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceChecklistController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmAcceptanceChecklistBo; +import com.ruoyi.rm.domain.vo.RmAcceptanceChecklistVo; +import com.ruoyi.rm.service.IRmAcceptanceChecklistService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/acceptanceChecklist") +public class RmAcceptanceChecklistController extends BaseController { + + private final IRmAcceptanceChecklistService service; + + @GetMapping("/list") + public TableDataInfo list(RmAcceptanceChecklistBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{checkId}") + public R getInfo(@PathVariable @NotNull Long checkId) { + return R.ok(service.queryById(checkId)); + } + + @Log(title = "验收检查清单", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmAcceptanceChecklistBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "验收检查清单", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmAcceptanceChecklistBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "验收检查清单", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkIds}") + public R remove(@PathVariable @NotEmpty Long[] checkIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(checkIds), true)); + } + + @GetMapping("/all") + public R> all(RmAcceptanceChecklistBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceItemController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceItemController.java new file mode 100644 index 0000000..9066264 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceItemController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmAcceptanceItemBo; +import com.ruoyi.rm.domain.vo.RmAcceptanceItemVo; +import com.ruoyi.rm.service.IRmAcceptanceItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/acceptanceItem") +public class RmAcceptanceItemController extends BaseController { + + private final IRmAcceptanceItemService service; + + @GetMapping("/list") + public TableDataInfo list(RmAcceptanceItemBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{acceptItemId}") + public R getInfo(@PathVariable @NotNull Long acceptItemId) { + return R.ok(service.queryById(acceptItemId)); + } + + @Log(title = "安装验收项", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmAcceptanceItemBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "安装验收项", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmAcceptanceItemBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "安装验收项", businessType = BusinessType.DELETE) + @DeleteMapping("/{acceptItemIds}") + public R remove(@PathVariable @NotEmpty Long[] acceptItemIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(acceptItemIds), true)); + } + + @GetMapping("/all") + public R> all(RmAcceptanceItemBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningChecklistController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningChecklistController.java new file mode 100644 index 0000000..605199d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningChecklistController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmCommissioningChecklistBo; +import com.ruoyi.rm.domain.vo.RmCommissioningChecklistVo; +import com.ruoyi.rm.service.IRmCommissioningChecklistService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/commissioningChecklist") +public class RmCommissioningChecklistController extends BaseController { + + private final IRmCommissioningChecklistService service; + + @GetMapping("/list") + public TableDataInfo list(RmCommissioningChecklistBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{checkId}") + public R getInfo(@PathVariable @NotNull Long checkId) { + return R.ok(service.queryById(checkId)); + } + + @Log(title = "热负荷试车CheckList", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmCommissioningChecklistBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "热负荷试车CheckList", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmCommissioningChecklistBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "热负荷试车CheckList", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkIds}") + public R remove(@PathVariable @NotEmpty Long[] checkIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(checkIds), true)); + } + + @GetMapping("/all") + public R> all(RmCommissioningChecklistBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningClauseController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningClauseController.java new file mode 100644 index 0000000..5a3ea85 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningClauseController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmCommissioningClauseBo; +import com.ruoyi.rm.domain.vo.RmCommissioningClauseVo; +import com.ruoyi.rm.service.IRmCommissioningClauseService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/commissioningClause") +public class RmCommissioningClauseController extends BaseController { + + private final IRmCommissioningClauseService service; + + @GetMapping("/list") + public TableDataInfo list(RmCommissioningClauseBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{clauseId}") + public R getInfo(@PathVariable @NotNull Long clauseId) { + return R.ok(service.queryById(clauseId)); + } + + @Log(title = "热负荷试车条款", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmCommissioningClauseBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "热负荷试车条款", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmCommissioningClauseBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "热负荷试车条款", businessType = BusinessType.DELETE) + @DeleteMapping("/{clauseIds}") + public R remove(@PathVariable @NotEmpty Long[] clauseIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(clauseIds), true)); + } + + @GetMapping("/all") + public R> all(RmCommissioningClauseBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java new file mode 100644 index 0000000..bc7da6e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java @@ -0,0 +1,25 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.rm.service.IRmDashboardService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; +import java.util.Map; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/dashboard") +public class RmDashboardController extends BaseController { + + private final IRmDashboardService dashboardService; + + @GetMapping("/stageStatus/{projectId}") + public R> stageStatus(@PathVariable @NotNull Long projectId) { + return R.ok(dashboardService.getStageStatus(projectId)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDocLibController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDocLibController.java new file mode 100644 index 0000000..7e2d7bb --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDocLibController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmDocLibBo; +import com.ruoyi.rm.domain.vo.RmDocLibVo; +import com.ruoyi.rm.service.IRmDocLibService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/docLib") +public class RmDocLibController extends BaseController { + + private final IRmDocLibService service; + + @GetMapping("/list") + public TableDataInfo list(RmDocLibBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{docId}") + public R getInfo(@PathVariable @NotNull Long docId) { + return R.ok(service.queryById(docId)); + } + + @Log(title = "图纸资料库", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmDocLibBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "图纸资料库", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmDocLibBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "图纸资料库", businessType = BusinessType.DELETE) + @DeleteMapping("/{docIds}") + public R remove(@PathVariable @NotEmpty Long[] docIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(docIds), true)); + } + + @GetMapping("/all") + public R> all(RmDocLibBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingCompareController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingCompareController.java new file mode 100644 index 0000000..ea9da9d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingCompareController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmDrawingCompareBo; +import com.ruoyi.rm.domain.vo.RmDrawingCompareVo; +import com.ruoyi.rm.service.IRmDrawingCompareService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/drawingCompare") +public class RmDrawingCompareController extends BaseController { + + private final IRmDrawingCompareService service; + + @GetMapping("/list") + public TableDataInfo list(RmDrawingCompareBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{compareId}") + public R getInfo(@PathVariable @NotNull Long compareId) { + return R.ok(service.queryById(compareId)); + } + + @Log(title = "图纸优化比较", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmDrawingCompareBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "图纸优化比较", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmDrawingCompareBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "图纸优化比较", businessType = BusinessType.DELETE) + @DeleteMapping("/{compareIds}") + public R remove(@PathVariable @NotEmpty Long[] compareIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(compareIds), true)); + } + + @GetMapping("/all") + public R> all(RmDrawingCompareBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallFeedbackController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallFeedbackController.java new file mode 100644 index 0000000..a4bf9ea --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallFeedbackController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmInstallFeedbackBo; +import com.ruoyi.rm.domain.vo.RmInstallFeedbackVo; +import com.ruoyi.rm.service.IRmInstallFeedbackService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/installFeedback") +public class RmInstallFeedbackController extends BaseController { + + private final IRmInstallFeedbackService service; + + @GetMapping("/list") + public TableDataInfo list(RmInstallFeedbackBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{feedbackId}") + public R getInfo(@PathVariable @NotNull Long feedbackId) { + return R.ok(service.queryById(feedbackId)); + } + + @Log(title = "安装问题反馈", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmInstallFeedbackBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "安装问题反馈", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmInstallFeedbackBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "安装问题反馈", businessType = BusinessType.DELETE) + @DeleteMapping("/{feedbackIds}") + public R remove(@PathVariable @NotEmpty Long[] feedbackIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(feedbackIds), true)); + } + + @GetMapping("/all") + public R> all(RmInstallFeedbackBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPersonnelController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPersonnelController.java new file mode 100644 index 0000000..6b3445d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPersonnelController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmInstallPersonnelBo; +import com.ruoyi.rm.domain.vo.RmInstallPersonnelVo; +import com.ruoyi.rm.service.IRmInstallPersonnelService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/installPersonnel") +public class RmInstallPersonnelController extends BaseController { + + private final IRmInstallPersonnelService service; + + @GetMapping("/list") + public TableDataInfo list(RmInstallPersonnelBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{personnelId}") + public R getInfo(@PathVariable @NotNull Long personnelId) { + return R.ok(service.queryById(personnelId)); + } + + @Log(title = "安装人员", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmInstallPersonnelBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "安装人员", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmInstallPersonnelBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "安装人员", businessType = BusinessType.DELETE) + @DeleteMapping("/{personnelIds}") + public R remove(@PathVariable @NotEmpty Long[] personnelIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(personnelIds), true)); + } + + @GetMapping("/all") + public R> all(RmInstallPersonnelBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPrecisionController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPrecisionController.java new file mode 100644 index 0000000..56b7681 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPrecisionController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmInstallPrecisionBo; +import com.ruoyi.rm.domain.vo.RmInstallPrecisionVo; +import com.ruoyi.rm.service.IRmInstallPrecisionService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/installPrecision") +public class RmInstallPrecisionController extends BaseController { + + private final IRmInstallPrecisionService service; + + @GetMapping("/list") + public TableDataInfo list(RmInstallPrecisionBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{precisionId}") + public R getInfo(@PathVariable @NotNull Long precisionId) { + return R.ok(service.queryById(precisionId)); + } + + @Log(title = "安装精度", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmInstallPrecisionBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "安装精度", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmInstallPrecisionBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "安装精度", businessType = BusinessType.DELETE) + @DeleteMapping("/{precisionIds}") + public R remove(@PathVariable @NotEmpty Long[] precisionIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(precisionIds), true)); + } + + @GetMapping("/all") + public R> all(RmInstallPrecisionBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallProgressController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallProgressController.java new file mode 100644 index 0000000..6f725c4 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallProgressController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmInstallProgressBo; +import com.ruoyi.rm.domain.vo.RmInstallProgressVo; +import com.ruoyi.rm.service.IRmInstallProgressService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/installProgress") +public class RmInstallProgressController extends BaseController { + + private final IRmInstallProgressService service; + + @GetMapping("/list") + public TableDataInfo list(RmInstallProgressBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{progressId}") + public R getInfo(@PathVariable @NotNull Long progressId) { + return R.ok(service.queryById(progressId)); + } + + @Log(title = "安装进度", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmInstallProgressBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "安装进度", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmInstallProgressBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "安装进度", businessType = BusinessType.DELETE) + @DeleteMapping("/{progressIds}") + public R remove(@PathVariable @NotEmpty Long[] progressIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(progressIds), true)); + } + + @GetMapping("/all") + public R> all(RmInstallProgressBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallToolController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallToolController.java new file mode 100644 index 0000000..c427ba7 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallToolController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmInstallToolBo; +import com.ruoyi.rm.domain.vo.RmInstallToolVo; +import com.ruoyi.rm.service.IRmInstallToolService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/installTool") +public class RmInstallToolController extends BaseController { + + private final IRmInstallToolService service; + + @GetMapping("/list") + public TableDataInfo list(RmInstallToolBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{toolId}") + public R getInfo(@PathVariable @NotNull Long toolId) { + return R.ok(service.queryById(toolId)); + } + + @Log(title = "安装工具", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmInstallToolBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "安装工具", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmInstallToolBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "安装工具", businessType = BusinessType.DELETE) + @DeleteMapping("/{toolIds}") + public R remove(@PathVariable @NotEmpty Long[] toolIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(toolIds), true)); + } + + @GetMapping("/all") + public R> all(RmInstallToolBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmManualController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmManualController.java new file mode 100644 index 0000000..6ca3883 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmManualController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmManualBo; +import com.ruoyi.rm.domain.vo.RmManualVo; +import com.ruoyi.rm.service.IRmManualService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/manual") +public class RmManualController extends BaseController { + + private final IRmManualService service; + + @GetMapping("/list") + public TableDataInfo list(RmManualBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{manualId}") + public R getInfo(@PathVariable @NotNull Long manualId) { + return R.ok(service.queryById(manualId)); + } + + @Log(title = "设备说明书", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmManualBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "设备说明书", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmManualBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "设备说明书", businessType = BusinessType.DELETE) + @DeleteMapping("/{manualIds}") + public R remove(@PathVariable @NotEmpty Long[] manualIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(manualIds), true)); + } + + @GetMapping("/all") + public R> all(RmManualBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectMemberController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectMemberController.java new file mode 100644 index 0000000..59cac69 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectMemberController.java @@ -0,0 +1,61 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmProjectMemberBo; +import com.ruoyi.rm.domain.vo.RmProjectMemberVo; +import com.ruoyi.rm.service.IRmProjectMemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/projectMember") +public class RmProjectMemberController extends BaseController { + + private final IRmProjectMemberService service; + + @GetMapping("/list") + public TableDataInfo list(RmProjectMemberBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{memberId}") + public R getInfo(@PathVariable @NotNull Long memberId) { + return R.ok(service.queryById(memberId)); + } + + @Log(title = "项目成员", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmProjectMemberBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "项目成员", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmProjectMemberBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "项目成员", businessType = BusinessType.DELETE) + @DeleteMapping("/{memberIds}") + public R remove(@PathVariable @NotEmpty Long[] memberIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(memberIds), true)); + } + + @GetMapping("/all") + public R> all(RmProjectMemberBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingChecklistController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingChecklistController.java new file mode 100644 index 0000000..2a05b07 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingChecklistController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmShippingChecklistBo; +import com.ruoyi.rm.domain.vo.RmShippingChecklistVo; +import com.ruoyi.rm.service.IRmShippingChecklistService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/shippingChecklist") +public class RmShippingChecklistController extends BaseController { + + private final IRmShippingChecklistService service; + + @GetMapping("/list") + public TableDataInfo list(RmShippingChecklistBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{checklistId}") + public R getInfo(@PathVariable @NotNull Long checklistId) { + return R.ok(service.queryById(checklistId)); + } + + @Log(title = "发货前检查清单", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmShippingChecklistBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "发货前检查清单", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmShippingChecklistBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "发货前检查清单", businessType = BusinessType.DELETE) + @DeleteMapping("/{checklistIds}") + public R remove(@PathVariable @NotEmpty Long[] checklistIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(checklistIds), true)); + } + + @GetMapping("/all") + public R> all(RmShippingChecklistBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingItemController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingItemController.java new file mode 100644 index 0000000..d61ff46 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingItemController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmShippingItemBo; +import com.ruoyi.rm.domain.vo.RmShippingItemVo; +import com.ruoyi.rm.service.IRmShippingItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/shippingItem") +public class RmShippingItemController extends BaseController { + + private final IRmShippingItemService service; + + @GetMapping("/list") + public TableDataInfo list(RmShippingItemBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{itemId}") + public R getInfo(@PathVariable @NotNull Long itemId) { + return R.ok(service.queryById(itemId)); + } + + @Log(title = "发货设备项", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmShippingItemBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "发货设备项", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmShippingItemBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "发货设备项", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@PathVariable @NotEmpty Long[] itemIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(itemIds), true)); + } + + @GetMapping("/all") + public R> all(RmShippingItemBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModController.java new file mode 100644 index 0000000..cbc6a61 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModController.java @@ -0,0 +1,60 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmSiteModBo; +import com.ruoyi.rm.domain.vo.RmSiteModVo; +import com.ruoyi.rm.service.IRmSiteModService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/siteMod") +public class RmSiteModController extends BaseController { + + private final IRmSiteModService service; + + @GetMapping("/list") + public TableDataInfo list(RmSiteModBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{modId}") + public R getInfo(@PathVariable @NotNull Long modId) { + return R.ok(service.queryById(modId)); + } + + @Log(title = "现场修改", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmSiteModBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "现场修改", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmSiteModBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "现场修改", businessType = BusinessType.DELETE) + @DeleteMapping("/{modIds}") + public R remove(@PathVariable @NotEmpty Long[] modIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(modIds), true)); + } + + @GetMapping("/all") + public R> all(RmSiteModBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModMediaController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModMediaController.java new file mode 100644 index 0000000..84b2045 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModMediaController.java @@ -0,0 +1,54 @@ +package com.ruoyi.rm.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.rm.domain.bo.RmSiteModMediaBo; +import com.ruoyi.rm.domain.vo.RmSiteModMediaVo; +import com.ruoyi.rm.service.IRmSiteModMediaService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/rm/siteModMedia") +public class RmSiteModMediaController extends BaseController { + + private final IRmSiteModMediaService service; + + @GetMapping("/list") + public TableDataInfo list(RmSiteModMediaBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{mediaId}") + public R getInfo(@PathVariable @NotNull Long mediaId) { + return R.ok(service.queryById(mediaId)); + } + + @Log(title = "现场修改多媒体", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmSiteModMediaBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "现场修改多媒体", businessType = BusinessType.DELETE) + @DeleteMapping("/{mediaIds}") + public R remove(@PathVariable @NotEmpty Long[] mediaIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(mediaIds), true)); + } + + @GetMapping("/all") + public R> all(RmSiteModMediaBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceChecklistBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceChecklistBo.java new file mode 100644 index 0000000..5ede1a9 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceChecklistBo.java @@ -0,0 +1,16 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmAcceptanceChecklistBo extends BaseEntity { + private Long checkId; + private Long projectId; + private String itemText; + private String isChecked; + private Integer sortOrder; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceItemBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceItemBo.java new file mode 100644 index 0000000..e79109b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceItemBo.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmAcceptanceItemBo extends BaseEntity { + private Long acceptItemId; + private Long projectId; + private String itemName; + private String requirement; + private String actualValue; + private String result; + private String notes; + private String inspector; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date inspectDate; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningChecklistBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningChecklistBo.java new file mode 100644 index 0000000..cf7bef2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningChecklistBo.java @@ -0,0 +1,16 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmCommissioningChecklistBo extends BaseEntity { + private Long checkId; + private Long projectId; + private String itemText; + private String isChecked; + private Integer sortOrder; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningClauseBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningClauseBo.java new file mode 100644 index 0000000..ec8cbcf --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningClauseBo.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmCommissioningClauseBo extends BaseEntity { + private Long clauseId; + private Long projectId; + private String clause; + private String standard; + private String result; + private String passFlag; + private Integer sortOrder; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDocLibBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDocLibBo.java new file mode 100644 index 0000000..de80b14 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDocLibBo.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmDocLibBo extends BaseEntity { + private Long docId; + private Long projectId; + private String docName; + private String category; + private String version; + private String uploader; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date uploadDate; + private String fileUrl; + private String description; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingCompareBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingCompareBo.java new file mode 100644 index 0000000..ff0c26d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingCompareBo.java @@ -0,0 +1,26 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmDrawingCompareBo extends BaseEntity { + private Long compareId; + private Long projectId; + private String drawingName; + private String oldVersion; + private String newVersion; + private String optimizer; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date compareDate; + private String status; + private String beforeDesc; + private String afterDesc; + private String diffNotes; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallFeedbackBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallFeedbackBo.java new file mode 100644 index 0000000..216abb1 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallFeedbackBo.java @@ -0,0 +1,25 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmInstallFeedbackBo extends BaseEntity { + private Long feedbackId; + private Long projectId; + private String title; + private String location; + private String proposer; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date feedbackDate; + private String issueDesc; + private String solution; + private String preventAction; + private String status; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPersonnelBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPersonnelBo.java new file mode 100644 index 0000000..de26377 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPersonnelBo.java @@ -0,0 +1,27 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmInstallPersonnelBo extends BaseEntity { + private Long personnelId; + private Long projectId; + private String name; + private String nameEn; + private String position; + private String positionEn; + private String planIn; + private String planOut; + private Integer days; + private BigDecimal dailyRate; + private BigDecimal totalWages; + private String duty; + private String qualification; + private String phone; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPrecisionBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPrecisionBo.java new file mode 100644 index 0000000..d1b9b5c --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPrecisionBo.java @@ -0,0 +1,26 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmInstallPrecisionBo extends BaseEntity { + private Long precisionId; + private Long projectId; + private String systemName; + private String itemName; + private String nameEn; + private String targetValue; + private String unit; + private String importance; + private String tool; + private String methodDesc; + private String standardRef; + private String requirement; + private String actualValue; + private String isQualified; + private String photos; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallProgressBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallProgressBo.java new file mode 100644 index 0000000..6ea6efa --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallProgressBo.java @@ -0,0 +1,30 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmInstallProgressBo extends BaseEntity { + + private Long progressId; + private Long projectId; + private String itemName; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStart; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planEnd; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actualStart; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actualEnd; + private String status; + private String delayReason; + private String images; + private String videos; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallToolBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallToolBo.java new file mode 100644 index 0000000..fbba2ab --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallToolBo.java @@ -0,0 +1,31 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmInstallToolBo extends BaseEntity { + private Long toolId; + private Long projectId; + private String name; + private String nameEn; + private String spec; + private Integer qty; + private String unit; + private BigDecimal unitPrice; + private BigDecimal totalPrice; + private String priority; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arrivalDate; + private String purpose; + private String responsible; + private String status; + private String category; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmManualBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmManualBo.java new file mode 100644 index 0000000..59861af --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmManualBo.java @@ -0,0 +1,23 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmManualBo extends BaseEntity { + private Long manualId; + private Long projectId; + private String manualName; + private String docType; + private String version; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date uploadDate; + private String fileUrl; + private String description; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java index 4c921c2..2246854 100644 --- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java @@ -21,6 +21,7 @@ public class RmProjectBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; private String manager; + private Long managerId; private String status; private String remark; } diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectMemberBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectMemberBo.java new file mode 100644 index 0000000..b688074 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectMemberBo.java @@ -0,0 +1,14 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmProjectMemberBo extends BaseEntity { + private Long memberId; + private Long projectId; + private Long userId; + private String role; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingChecklistBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingChecklistBo.java new file mode 100644 index 0000000..fe6ad1b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingChecklistBo.java @@ -0,0 +1,16 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmShippingChecklistBo extends BaseEntity { + private Long checklistId; + private Long projectId; + private String itemText; + private String isChecked; + private Integer sortOrder; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingItemBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingItemBo.java new file mode 100644 index 0000000..989f006 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingItemBo.java @@ -0,0 +1,26 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmShippingItemBo extends BaseEntity { + private Long itemId; + private Long projectId; + private String deviceName; + private String spec; + private Integer qty; + private String packed; + private String photos; + private String note; + private String destination; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date shipDate; + private String status; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModBo.java new file mode 100644 index 0000000..69845b4 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModBo.java @@ -0,0 +1,26 @@ +package com.ruoyi.rm.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmSiteModBo extends BaseEntity { + private Long modId; + private Long projectId; + private String deviceName; + private String location; + private String modReason; + private String solution; + private String modPerson; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date modDate; + private String status; + private String preventAction; + private String drawingUpdated; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModMediaBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModMediaBo.java new file mode 100644 index 0000000..0d41bce --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModMediaBo.java @@ -0,0 +1,17 @@ +package com.ruoyi.rm.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class RmSiteModMediaBo extends BaseEntity { + private Long mediaId; + private Long modId; + private String mediaType; + private String fileName; + private String fileUrl; + private Long fileSize; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceChecklist.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceChecklist.java new file mode 100644 index 0000000..2551f78 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceChecklist.java @@ -0,0 +1,27 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_acceptance_checklist") +public class RmAcceptanceChecklist extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long checkId; + private Long projectId; + private String itemText; + private String isChecked; + private Integer sortOrder; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceItem.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceItem.java new file mode 100644 index 0000000..7eed6e4 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceItem.java @@ -0,0 +1,34 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_acceptance_item") +public class RmAcceptanceItem extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long acceptItemId; + private Long projectId; + private String itemName; + private String requirement; + private String actualValue; + private String result; + private String notes; + private String inspector; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date inspectDate; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningChecklist.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningChecklist.java new file mode 100644 index 0000000..d1e01c7 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningChecklist.java @@ -0,0 +1,27 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_commissioning_checklist") +public class RmCommissioningChecklist extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long checkId; + private Long projectId; + private String itemText; + private String isChecked; + private Integer sortOrder; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningClause.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningClause.java new file mode 100644 index 0000000..3968b57 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningClause.java @@ -0,0 +1,29 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_commissioning_clause") +public class RmCommissioningClause extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long clauseId; + private Long projectId; + private String clause; + private String standard; + private String result; + private String passFlag; + private Integer sortOrder; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDocLib.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDocLib.java new file mode 100644 index 0000000..8c48dee --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDocLib.java @@ -0,0 +1,34 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_doc_lib") +public class RmDocLib extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long docId; + private Long projectId; + private String docName; + private String category; + private String version; + private String uploader; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date uploadDate; + private String fileUrl; + private String description; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingCompare.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingCompare.java new file mode 100644 index 0000000..e5bb875 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingCompare.java @@ -0,0 +1,36 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_drawing_compare") +public class RmDrawingCompare extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long compareId; + private Long projectId; + private String drawingName; + private String oldVersion; + private String newVersion; + private String optimizer; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date compareDate; + private String status; + private String beforeDesc; + private String afterDesc; + private String diffNotes; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallFeedback.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallFeedback.java new file mode 100644 index 0000000..a1ebe90 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallFeedback.java @@ -0,0 +1,35 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_install_feedback") +public class RmInstallFeedback extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long feedbackId; + private Long projectId; + private String title; + private String location; + private String proposer; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date feedbackDate; + private String issueDesc; + private String solution; + private String preventAction; + private String status; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPersonnel.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPersonnel.java new file mode 100644 index 0000000..82afbe4 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPersonnel.java @@ -0,0 +1,37 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_install_personnel") +public class RmInstallPersonnel extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long personnelId; + private Long projectId; + private String name; + private String nameEn; + private String position; + private String positionEn; + private String planIn; + private String planOut; + private Integer days; + private BigDecimal dailyRate; + private BigDecimal totalWages; + private String duty; + private String qualification; + private String phone; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPrecision.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPrecision.java new file mode 100644 index 0000000..13887e5 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPrecision.java @@ -0,0 +1,37 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_install_precision") +public class RmInstallPrecision extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long precisionId; + private Long projectId; + private String systemName; + private String itemName; + private String nameEn; + private String targetValue; + private String unit; + private String importance; + private String tool; + private String methodDesc; + private String standardRef; + private String requirement; + private String actualValue; + private String isQualified; + private String photos; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallProgress.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallProgress.java new file mode 100644 index 0000000..d804c25 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallProgress.java @@ -0,0 +1,39 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_install_progress") +public class RmInstallProgress extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long progressId; + private Long projectId; + private String itemName; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStart; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planEnd; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actualStart; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actualEnd; + private String status; + private String delayReason; + private String images; + private String videos; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallTool.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallTool.java new file mode 100644 index 0000000..06862ca --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallTool.java @@ -0,0 +1,41 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_install_tool") +public class RmInstallTool extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long toolId; + private Long projectId; + private String name; + private String nameEn; + private String spec; + private Integer qty; + private String unit; + private BigDecimal unitPrice; + private BigDecimal totalPrice; + private String priority; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arrivalDate; + private String purpose; + private String responsible; + private String status; + private String category; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmManual.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmManual.java new file mode 100644 index 0000000..d7ec69f --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmManual.java @@ -0,0 +1,33 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_manual") +public class RmManual extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long manualId; + private Long projectId; + private String manualName; + private String docType; + private String version; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date uploadDate; + private String fileUrl; + private String description; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java index 5c882f6..2ac5b4a 100644 --- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java @@ -28,6 +28,7 @@ public class RmProject extends BaseEntity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; private String manager; + private Long managerId; private String status; private String remark; @TableLogic diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProjectMember.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProjectMember.java new file mode 100644 index 0000000..371cd7e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProjectMember.java @@ -0,0 +1,25 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_project_member") +public class RmProjectMember extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long memberId; + private Long projectId; + private Long userId; + private String role; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingChecklist.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingChecklist.java new file mode 100644 index 0000000..3e414c7 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingChecklist.java @@ -0,0 +1,27 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_shipping_checklist") +public class RmShippingChecklist extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long checklistId; + private Long projectId; + private String itemText; + private String isChecked; + private Integer sortOrder; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingItem.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingItem.java new file mode 100644 index 0000000..d4e15fd --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingItem.java @@ -0,0 +1,36 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_shipping_item") +public class RmShippingItem extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long itemId; + private Long projectId; + private String deviceName; + private String spec; + private Integer qty; + private String packed; + private String photos; + private String note; + private String destination; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date shipDate; + private String status; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteMod.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteMod.java new file mode 100644 index 0000000..9591cfe --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteMod.java @@ -0,0 +1,36 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_site_mod") +public class RmSiteMod extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long modId; + private Long projectId; + private String deviceName; + private String location; + private String modReason; + private String solution; + private String modPerson; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date modDate; + private String status; + private String preventAction; + private String drawingUpdated; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteModMedia.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteModMedia.java new file mode 100644 index 0000000..5554265 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteModMedia.java @@ -0,0 +1,28 @@ +package com.ruoyi.rm.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fad_rm_site_mod_media") +public class RmSiteModMedia extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Long mediaId; + private Long modId; + private String mediaType; + private String fileName; + private String fileUrl; + private Long fileSize; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceChecklistVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceChecklistVo.java new file mode 100644 index 0000000..858005a --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceChecklistVo.java @@ -0,0 +1,29 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmAcceptanceChecklistVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "检查项ID") + private Long checkId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "检查项内容") + private String itemText; + + @Excel(name = "是否完成") + private String isChecked; + + @Excel(name = "排序号") + private Integer sortOrder; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceItemVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceItemVo.java new file mode 100644 index 0000000..15fdeaf --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceItemVo.java @@ -0,0 +1,41 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmAcceptanceItemVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "验收项ID") + private Long acceptItemId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "验收项目") + private String itemName; + + @Excel(name = "要求值") + private String requirement; + + @Excel(name = "实测值") + private String actualValue; + + @Excel(name = "结果") + private String result; + + @Excel(name = "备注") + private String notes; + + @Excel(name = "验收人") + private String inspector; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "验收日期", width = 15) + private Date inspectDate; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningChecklistVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningChecklistVo.java new file mode 100644 index 0000000..b51e403 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningChecklistVo.java @@ -0,0 +1,29 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmCommissioningChecklistVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "检查项ID") + private Long checkId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "试车项内容") + private String itemText; + + @Excel(name = "是否完成") + private String isChecked; + + @Excel(name = "排序号") + private Integer sortOrder; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningClauseVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningClauseVo.java new file mode 100644 index 0000000..fa2e02a --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningClauseVo.java @@ -0,0 +1,35 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmCommissioningClauseVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "条款ID") + private Long clauseId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "技术协议条款") + private String clause; + + @Excel(name = "标准要求") + private String standard; + + @Excel(name = "试车结果") + private String result; + + @Excel(name = "是否合格") + private String passFlag; + + @Excel(name = "排序号") + private Integer sortOrder; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDocLibVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDocLibVo.java new file mode 100644 index 0000000..c656c60 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDocLibVo.java @@ -0,0 +1,44 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmDocLibVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "资料ID") + private Long docId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "资料名称") + private String docName; + + @Excel(name = "分类") + private String category; + + @Excel(name = "版本") + private String version; + + @Excel(name = "上传人") + private String uploader; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上传日期", width = 15) + private Date uploadDate; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "描述") + private String description; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingCompareVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingCompareVo.java new file mode 100644 index 0000000..5c65da3 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingCompareVo.java @@ -0,0 +1,50 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmDrawingCompareVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "对比ID") + private Long compareId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "图纸名称") + private String drawingName; + + @Excel(name = "优化前版本") + private String oldVersion; + + @Excel(name = "优化后版本") + private String newVersion; + + @Excel(name = "优化人") + private String optimizer; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "优化日期", width = 15) + private Date compareDate; + + @Excel(name = "状态") + private String status; + + @Excel(name = "优化前问题描述") + private String beforeDesc; + + @Excel(name = "优化后改进内容") + private String afterDesc; + + @Excel(name = "优化效果评价") + private String diffNotes; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallFeedbackVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallFeedbackVo.java new file mode 100644 index 0000000..59a7140 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallFeedbackVo.java @@ -0,0 +1,44 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmInstallFeedbackVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "反馈ID") + private Long feedbackId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "问题标题") + private String title; + + @Excel(name = "发生位置") + private String location; + + @Excel(name = "反馈人") + private String proposer; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "反馈日期", width = 15) + private Date feedbackDate; + + @Excel(name = "问题描述") + private String issueDesc; + + @Excel(name = "解决方案") + private String solution; + + @Excel(name = "防止再发措施") + private String preventAction; + + @Excel(name = "状态") + private String status; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallPersonnelVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallPersonnelVo.java new file mode 100644 index 0000000..86e7c84 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallPersonnelVo.java @@ -0,0 +1,57 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class RmInstallPersonnelVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "人员ID") + private Long personnelId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "姓名") + private String name; + + @Excel(name = "姓名(英文)") + private String nameEn; + + @Excel(name = "职位") + private String position; + + @Excel(name = "职位(英文)") + private String positionEn; + + @Excel(name = "计划进场日期") + private String planIn; + + @Excel(name = "计划退场日期") + private String planOut; + + @Excel(name = "天数") + private Integer days; + + @Excel(name = "日工资") + private BigDecimal dailyRate; + + @Excel(name = "工资总额") + private BigDecimal totalWages; + + @Excel(name = "职责") + private String duty; + + @Excel(name = "资质") + private String qualification; + + @Excel(name = "电话") + private String phone; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallPrecisionVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallPrecisionVo.java new file mode 100644 index 0000000..3a58647 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallPrecisionVo.java @@ -0,0 +1,59 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmInstallPrecisionVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "精度ID") + private Long precisionId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "系统名称") + private String systemName; + + @Excel(name = "项目名称") + private String itemName; + + @Excel(name = "英文名称") + private String nameEn; + + @Excel(name = "目标值") + private String targetValue; + + @Excel(name = "单位") + private String unit; + + @Excel(name = "重要程度") + private String importance; + + @Excel(name = "工具") + private String tool; + + @Excel(name = "方法说明") + private String methodDesc; + + @Excel(name = "标准参考") + private String standardRef; + + @Excel(name = "要求") + private String requirement; + + @Excel(name = "实际值") + private String actualValue; + + @Excel(name = "是否合格") + private String isQualified; + + @Excel(name = "照片") + private String photos; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallProgressVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallProgressVo.java new file mode 100644 index 0000000..d193cae --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallProgressVo.java @@ -0,0 +1,53 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmInstallProgressVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "进度ID") + private Long progressId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "项目名称") + private String itemName; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划开始", width = 15) + private Date planStart; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划结束", width = 15) + private Date planEnd; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际开始", width = 15) + private Date actualStart; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际结束", width = 15) + private Date actualEnd; + + @Excel(name = "状态") + private String status; + + @Excel(name = "延迟原因") + private String delayReason; + + @Excel(name = "图片") + private String images; + + @Excel(name = "视频") + private String videos; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallToolVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallToolVo.java new file mode 100644 index 0000000..db58633 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallToolVo.java @@ -0,0 +1,63 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class RmInstallToolVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "工具ID") + private Long toolId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "工具名称") + private String name; + + @Excel(name = "工具英文名称") + private String nameEn; + + @Excel(name = "规格型号") + private String spec; + + @Excel(name = "数量") + private Integer qty; + + @Excel(name = "单位") + private String unit; + + @Excel(name = "单价") + private BigDecimal unitPrice; + + @Excel(name = "总价") + private BigDecimal totalPrice; + + @Excel(name = "优先级") + private String priority; + + @Excel(name = "到货日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date arrivalDate; + + @Excel(name = "用途") + private String purpose; + + @Excel(name = "负责人") + private String responsible; + + @Excel(name = "状态") + private String status; + + @Excel(name = "类别") + private String category; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmManualVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmManualVo.java new file mode 100644 index 0000000..9771852 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmManualVo.java @@ -0,0 +1,41 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmManualVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "说明书ID") + private Long manualId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "文件名称") + private String manualName; + + @Excel(name = "类型") + private String docType; + + @Excel(name = "版本") + private String version; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上传日期", width = 15) + private Date uploadDate; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "描述") + private String description; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectMemberVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectMemberVo.java new file mode 100644 index 0000000..f243cdb --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectMemberVo.java @@ -0,0 +1,21 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmProjectMemberVo implements Serializable { + private static final long serialVersionUID = 1L; + + private Long memberId; + private Long projectId; + private Long userId; + private String role; + private String userName; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java index 466c56e..79e8df8 100644 --- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java @@ -34,6 +34,12 @@ public class RmProjectVo implements Serializable { @Excel(name = "项目经理") private String manager; + @Excel(name = "项目经理ID") + private Long managerId; + + @Excel(name = "项目经理名称") + private String managerName; + @Excel(name = "状态") private String status; diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmShippingChecklistVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmShippingChecklistVo.java new file mode 100644 index 0000000..1ce362a --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmShippingChecklistVo.java @@ -0,0 +1,29 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmShippingChecklistVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "清单项ID") + private Long checklistId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "清单项内容") + private String itemText; + + @Excel(name = "是否完成") + private String isChecked; + + @Excel(name = "排序号") + private Integer sortOrder; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmShippingItemVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmShippingItemVo.java new file mode 100644 index 0000000..e5db54b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmShippingItemVo.java @@ -0,0 +1,47 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmShippingItemVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "设备项ID") + private Long itemId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "设备名称") + private String deviceName; + + @Excel(name = "规格") + private String spec; + + @Excel(name = "数量") + private Integer qty; + + @Excel(name = "是否已打包") + private String packed; + + @Excel(name = "照片") + private String photos; + + @Excel(name = "备注") + private String note; + + @Excel(name = "目的地") + private String destination; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "发货日期", width = 15) + private Date shipDate; + + @Excel(name = "状态") + private String status; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmSiteModMediaVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmSiteModMediaVo.java new file mode 100644 index 0000000..849ed5e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmSiteModMediaVo.java @@ -0,0 +1,32 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmSiteModMediaVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "媒体ID") + private Long mediaId; + + @Excel(name = "修改记录ID") + private Long modId; + + @Excel(name = "媒体类型") + private String mediaType; + + @Excel(name = "文件名") + private String fileName; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "文件大小") + private Long fileSize; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmSiteModVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmSiteModVo.java new file mode 100644 index 0000000..cf2c1d9 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmSiteModVo.java @@ -0,0 +1,50 @@ +package com.ruoyi.rm.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmSiteModVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "修改记录ID") + private Long modId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "设备名称") + private String deviceName; + + @Excel(name = "位置") + private String location; + + @Excel(name = "修改原因") + private String modReason; + + @Excel(name = "修改方案") + private String solution; + + @Excel(name = "修改人") + private String modPerson; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "修改日期", width = 15) + private Date modDate; + + @Excel(name = "状态") + private String status; + + @Excel(name = "防止再发措施") + private String preventAction; + + @Excel(name = "已上传图纸") + private String drawingUpdated; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmAcceptanceChecklistMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmAcceptanceChecklistMapper.java new file mode 100644 index 0000000..1918492 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmAcceptanceChecklistMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmAcceptanceChecklist; +import com.ruoyi.rm.domain.vo.RmAcceptanceChecklistVo; + +public interface RmAcceptanceChecklistMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmAcceptanceItemMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmAcceptanceItemMapper.java new file mode 100644 index 0000000..1753f8f --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmAcceptanceItemMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmAcceptanceItem; +import com.ruoyi.rm.domain.vo.RmAcceptanceItemVo; + +public interface RmAcceptanceItemMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningChecklistMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningChecklistMapper.java new file mode 100644 index 0000000..a596139 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningChecklistMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmCommissioningChecklist; +import com.ruoyi.rm.domain.vo.RmCommissioningChecklistVo; + +public interface RmCommissioningChecklistMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningClauseMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningClauseMapper.java new file mode 100644 index 0000000..5e9406e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningClauseMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmCommissioningClause; +import com.ruoyi.rm.domain.vo.RmCommissioningClauseVo; + +public interface RmCommissioningClauseMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDocLibMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDocLibMapper.java new file mode 100644 index 0000000..f893638 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDocLibMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmDocLib; +import com.ruoyi.rm.domain.vo.RmDocLibVo; + +public interface RmDocLibMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingCompareMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingCompareMapper.java new file mode 100644 index 0000000..078ae9b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingCompareMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmDrawingCompare; +import com.ruoyi.rm.domain.vo.RmDrawingCompareVo; + +public interface RmDrawingCompareMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallFeedbackMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallFeedbackMapper.java new file mode 100644 index 0000000..5e0a712 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallFeedbackMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmInstallFeedback; +import com.ruoyi.rm.domain.vo.RmInstallFeedbackVo; + +public interface RmInstallFeedbackMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallPersonnelMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallPersonnelMapper.java new file mode 100644 index 0000000..505b0cf --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallPersonnelMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmInstallPersonnel; +import com.ruoyi.rm.domain.vo.RmInstallPersonnelVo; + +public interface RmInstallPersonnelMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallPrecisionMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallPrecisionMapper.java new file mode 100644 index 0000000..f34f331 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallPrecisionMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmInstallPrecision; +import com.ruoyi.rm.domain.vo.RmInstallPrecisionVo; + +public interface RmInstallPrecisionMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallProgressMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallProgressMapper.java new file mode 100644 index 0000000..eaa43e9 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallProgressMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmInstallProgress; +import com.ruoyi.rm.domain.vo.RmInstallProgressVo; + +public interface RmInstallProgressMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallToolMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallToolMapper.java new file mode 100644 index 0000000..fb1d786 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmInstallToolMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmInstallTool; +import com.ruoyi.rm.domain.vo.RmInstallToolVo; + +public interface RmInstallToolMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmManualMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmManualMapper.java new file mode 100644 index 0000000..0b7bd22 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmManualMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmManual; +import com.ruoyi.rm.domain.vo.RmManualVo; + +public interface RmManualMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProjectMemberMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProjectMemberMapper.java new file mode 100644 index 0000000..1e4681b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProjectMemberMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmProjectMember; +import com.ruoyi.rm.domain.vo.RmProjectMemberVo; + +public interface RmProjectMemberMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmShippingChecklistMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmShippingChecklistMapper.java new file mode 100644 index 0000000..71ecac2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmShippingChecklistMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmShippingChecklist; +import com.ruoyi.rm.domain.vo.RmShippingChecklistVo; + +public interface RmShippingChecklistMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmShippingItemMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmShippingItemMapper.java new file mode 100644 index 0000000..b43fc63 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmShippingItemMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmShippingItem; +import com.ruoyi.rm.domain.vo.RmShippingItemVo; + +public interface RmShippingItemMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmSiteModMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmSiteModMapper.java new file mode 100644 index 0000000..58b5599 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmSiteModMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmSiteMod; +import com.ruoyi.rm.domain.vo.RmSiteModVo; + +public interface RmSiteModMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmSiteModMediaMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmSiteModMediaMapper.java new file mode 100644 index 0000000..0953350 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmSiteModMediaMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmSiteModMedia; +import com.ruoyi.rm.domain.vo.RmSiteModMediaVo; + +public interface RmSiteModMediaMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmAcceptanceChecklistService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmAcceptanceChecklistService.java new file mode 100644 index 0000000..8ba3671 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmAcceptanceChecklistService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmAcceptanceChecklistBo; +import com.ruoyi.rm.domain.vo.RmAcceptanceChecklistVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmAcceptanceChecklistService { + RmAcceptanceChecklistVo queryById(Long checkId); + TableDataInfo queryPageList(RmAcceptanceChecklistBo bo, PageQuery pageQuery); + List queryList(RmAcceptanceChecklistBo bo); + Boolean insertByBo(RmAcceptanceChecklistBo bo); + Boolean updateByBo(RmAcceptanceChecklistBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmAcceptanceItemService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmAcceptanceItemService.java new file mode 100644 index 0000000..47df7fe --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmAcceptanceItemService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmAcceptanceItemBo; +import com.ruoyi.rm.domain.vo.RmAcceptanceItemVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmAcceptanceItemService { + RmAcceptanceItemVo queryById(Long acceptItemId); + TableDataInfo queryPageList(RmAcceptanceItemBo bo, PageQuery pageQuery); + List queryList(RmAcceptanceItemBo bo); + Boolean insertByBo(RmAcceptanceItemBo bo); + Boolean updateByBo(RmAcceptanceItemBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningChecklistService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningChecklistService.java new file mode 100644 index 0000000..7619959 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningChecklistService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmCommissioningChecklistBo; +import com.ruoyi.rm.domain.vo.RmCommissioningChecklistVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmCommissioningChecklistService { + RmCommissioningChecklistVo queryById(Long checkId); + TableDataInfo queryPageList(RmCommissioningChecklistBo bo, PageQuery pageQuery); + List queryList(RmCommissioningChecklistBo bo); + Boolean insertByBo(RmCommissioningChecklistBo bo); + Boolean updateByBo(RmCommissioningChecklistBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningClauseService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningClauseService.java new file mode 100644 index 0000000..5de26ed --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningClauseService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmCommissioningClauseBo; +import com.ruoyi.rm.domain.vo.RmCommissioningClauseVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmCommissioningClauseService { + RmCommissioningClauseVo queryById(Long clauseId); + TableDataInfo queryPageList(RmCommissioningClauseBo bo, PageQuery pageQuery); + List queryList(RmCommissioningClauseBo bo); + Boolean insertByBo(RmCommissioningClauseBo bo); + Boolean updateByBo(RmCommissioningClauseBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDashboardService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDashboardService.java new file mode 100644 index 0000000..9e3babd --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDashboardService.java @@ -0,0 +1,7 @@ +package com.ruoyi.rm.service; + +import java.util.Map; + +public interface IRmDashboardService { + Map getStageStatus(Long projectId); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDocLibService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDocLibService.java new file mode 100644 index 0000000..c061dfc --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDocLibService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmDocLibBo; +import com.ruoyi.rm.domain.vo.RmDocLibVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmDocLibService { + RmDocLibVo queryById(Long docId); + TableDataInfo queryPageList(RmDocLibBo bo, PageQuery pageQuery); + List queryList(RmDocLibBo bo); + Boolean insertByBo(RmDocLibBo bo); + Boolean updateByBo(RmDocLibBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingCompareService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingCompareService.java new file mode 100644 index 0000000..418cb19 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingCompareService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmDrawingCompareBo; +import com.ruoyi.rm.domain.vo.RmDrawingCompareVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmDrawingCompareService { + RmDrawingCompareVo queryById(Long compareId); + TableDataInfo queryPageList(RmDrawingCompareBo bo, PageQuery pageQuery); + List queryList(RmDrawingCompareBo bo); + Boolean insertByBo(RmDrawingCompareBo bo); + Boolean updateByBo(RmDrawingCompareBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallFeedbackService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallFeedbackService.java new file mode 100644 index 0000000..da17889 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallFeedbackService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmInstallFeedbackBo; +import com.ruoyi.rm.domain.vo.RmInstallFeedbackVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmInstallFeedbackService { + RmInstallFeedbackVo queryById(Long feedbackId); + TableDataInfo queryPageList(RmInstallFeedbackBo bo, PageQuery pageQuery); + List queryList(RmInstallFeedbackBo bo); + Boolean insertByBo(RmInstallFeedbackBo bo); + Boolean updateByBo(RmInstallFeedbackBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallPersonnelService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallPersonnelService.java new file mode 100644 index 0000000..8765c7a --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallPersonnelService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmInstallPersonnelBo; +import com.ruoyi.rm.domain.vo.RmInstallPersonnelVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmInstallPersonnelService { + RmInstallPersonnelVo queryById(Long personnelId); + TableDataInfo queryPageList(RmInstallPersonnelBo bo, PageQuery pageQuery); + List queryList(RmInstallPersonnelBo bo); + Boolean insertByBo(RmInstallPersonnelBo bo); + Boolean updateByBo(RmInstallPersonnelBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallPrecisionService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallPrecisionService.java new file mode 100644 index 0000000..70d0a6b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallPrecisionService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmInstallPrecisionBo; +import com.ruoyi.rm.domain.vo.RmInstallPrecisionVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmInstallPrecisionService { + RmInstallPrecisionVo queryById(Long precisionId); + TableDataInfo queryPageList(RmInstallPrecisionBo bo, PageQuery pageQuery); + List queryList(RmInstallPrecisionBo bo); + Boolean insertByBo(RmInstallPrecisionBo bo); + Boolean updateByBo(RmInstallPrecisionBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallProgressService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallProgressService.java new file mode 100644 index 0000000..8295929 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallProgressService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmInstallProgressBo; +import com.ruoyi.rm.domain.vo.RmInstallProgressVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmInstallProgressService { + + RmInstallProgressVo queryById(Long progressId); + + TableDataInfo queryPageList(RmInstallProgressBo bo, PageQuery pageQuery); + + List queryList(RmInstallProgressBo bo); + + Boolean insertByBo(RmInstallProgressBo bo); + + Boolean updateByBo(RmInstallProgressBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallToolService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallToolService.java new file mode 100644 index 0000000..7ee1cef --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmInstallToolService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmInstallToolBo; +import com.ruoyi.rm.domain.vo.RmInstallToolVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmInstallToolService { + RmInstallToolVo queryById(Long toolId); + TableDataInfo queryPageList(RmInstallToolBo bo, PageQuery pageQuery); + List queryList(RmInstallToolBo bo); + Boolean insertByBo(RmInstallToolBo bo); + Boolean updateByBo(RmInstallToolBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmManualService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmManualService.java new file mode 100644 index 0000000..673ecb0 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmManualService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmManualBo; +import com.ruoyi.rm.domain.vo.RmManualVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmManualService { + RmManualVo queryById(Long manualId); + TableDataInfo queryPageList(RmManualBo bo, PageQuery pageQuery); + List queryList(RmManualBo bo); + Boolean insertByBo(RmManualBo bo); + Boolean updateByBo(RmManualBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProjectMemberService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProjectMemberService.java new file mode 100644 index 0000000..84bbeed --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProjectMemberService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmProjectMemberBo; +import com.ruoyi.rm.domain.vo.RmProjectMemberVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmProjectMemberService { + + RmProjectMemberVo queryById(Long memberId); + + TableDataInfo queryPageList(RmProjectMemberBo bo, PageQuery pageQuery); + + List queryList(RmProjectMemberBo bo); + + Boolean insertByBo(RmProjectMemberBo bo); + + Boolean updateByBo(RmProjectMemberBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmShippingChecklistService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmShippingChecklistService.java new file mode 100644 index 0000000..80d65c5 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmShippingChecklistService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmShippingChecklistBo; +import com.ruoyi.rm.domain.vo.RmShippingChecklistVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmShippingChecklistService { + RmShippingChecklistVo queryById(Long checklistId); + TableDataInfo queryPageList(RmShippingChecklistBo bo, PageQuery pageQuery); + List queryList(RmShippingChecklistBo bo); + Boolean insertByBo(RmShippingChecklistBo bo); + Boolean updateByBo(RmShippingChecklistBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmShippingItemService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmShippingItemService.java new file mode 100644 index 0000000..f8eaf17 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmShippingItemService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmShippingItemBo; +import com.ruoyi.rm.domain.vo.RmShippingItemVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmShippingItemService { + RmShippingItemVo queryById(Long itemId); + TableDataInfo queryPageList(RmShippingItemBo bo, PageQuery pageQuery); + List queryList(RmShippingItemBo bo); + Boolean insertByBo(RmShippingItemBo bo); + Boolean updateByBo(RmShippingItemBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmSiteModMediaService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmSiteModMediaService.java new file mode 100644 index 0000000..1a89237 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmSiteModMediaService.java @@ -0,0 +1,17 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmSiteModMediaBo; +import com.ruoyi.rm.domain.vo.RmSiteModMediaVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmSiteModMediaService { + RmSiteModMediaVo queryById(Long mediaId); + TableDataInfo queryPageList(RmSiteModMediaBo bo, PageQuery pageQuery); + List queryList(RmSiteModMediaBo bo); + Boolean insertByBo(RmSiteModMediaBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmSiteModService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmSiteModService.java new file mode 100644 index 0000000..748b466 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmSiteModService.java @@ -0,0 +1,18 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmSiteModBo; +import com.ruoyi.rm.domain.vo.RmSiteModVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmSiteModService { + RmSiteModVo queryById(Long modId); + TableDataInfo queryPageList(RmSiteModBo bo, PageQuery pageQuery); + List queryList(RmSiteModBo bo); + Boolean insertByBo(RmSiteModBo bo); + Boolean updateByBo(RmSiteModBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmAcceptanceChecklistServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmAcceptanceChecklistServiceImpl.java new file mode 100644 index 0000000..de32c52 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmAcceptanceChecklistServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmAcceptanceChecklist; +import com.ruoyi.rm.domain.bo.RmAcceptanceChecklistBo; +import com.ruoyi.rm.domain.vo.RmAcceptanceChecklistVo; +import com.ruoyi.rm.mapper.RmAcceptanceChecklistMapper; +import com.ruoyi.rm.service.IRmAcceptanceChecklistService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmAcceptanceChecklistServiceImpl implements IRmAcceptanceChecklistService { + + private final RmAcceptanceChecklistMapper baseMapper; + + @Override + public RmAcceptanceChecklistVo queryById(Long checkId) { return baseMapper.selectVoById(checkId); } + + @Override + public TableDataInfo queryPageList(RmAcceptanceChecklistBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmAcceptanceChecklistBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmAcceptanceChecklistBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmAcceptanceChecklist.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmAcceptanceChecklistBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmAcceptanceChecklist.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmAcceptanceChecklistBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmAcceptanceChecklist::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmAcceptanceChecklist::getSortOrder); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmAcceptanceItemServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmAcceptanceItemServiceImpl.java new file mode 100644 index 0000000..667604f --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmAcceptanceItemServiceImpl.java @@ -0,0 +1,68 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmAcceptanceItem; +import com.ruoyi.rm.domain.bo.RmAcceptanceItemBo; +import com.ruoyi.rm.domain.vo.RmAcceptanceItemVo; +import com.ruoyi.rm.mapper.RmAcceptanceItemMapper; +import com.ruoyi.rm.service.IRmAcceptanceItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmAcceptanceItemServiceImpl implements IRmAcceptanceItemService { + + private final RmAcceptanceItemMapper baseMapper; + + @Override + public RmAcceptanceItemVo queryById(Long acceptItemId) { return baseMapper.selectVoById(acceptItemId); } + + @Override + public TableDataInfo queryPageList(RmAcceptanceItemBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmAcceptanceItemBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmAcceptanceItemBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmAcceptanceItem.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmAcceptanceItemBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmAcceptanceItem.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmAcceptanceItemBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmAcceptanceItem::getProjectId, bo.getProjectId()); + lqw.like(bo.getItemName() != null, RmAcceptanceItem::getItemName, bo.getItemName()); + lqw.eq(bo.getResult() != null, RmAcceptanceItem::getResult, bo.getResult()); + lqw.orderByAsc(RmAcceptanceItem::getAcceptItemId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningChecklistServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningChecklistServiceImpl.java new file mode 100644 index 0000000..fa5395d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningChecklistServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmCommissioningChecklist; +import com.ruoyi.rm.domain.bo.RmCommissioningChecklistBo; +import com.ruoyi.rm.domain.vo.RmCommissioningChecklistVo; +import com.ruoyi.rm.mapper.RmCommissioningChecklistMapper; +import com.ruoyi.rm.service.IRmCommissioningChecklistService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmCommissioningChecklistServiceImpl implements IRmCommissioningChecklistService { + + private final RmCommissioningChecklistMapper baseMapper; + + @Override + public RmCommissioningChecklistVo queryById(Long checkId) { return baseMapper.selectVoById(checkId); } + + @Override + public TableDataInfo queryPageList(RmCommissioningChecklistBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmCommissioningChecklistBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmCommissioningChecklistBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmCommissioningChecklist.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmCommissioningChecklistBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmCommissioningChecklist.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmCommissioningChecklistBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmCommissioningChecklist::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmCommissioningChecklist::getSortOrder); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningClauseServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningClauseServiceImpl.java new file mode 100644 index 0000000..113b633 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningClauseServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmCommissioningClause; +import com.ruoyi.rm.domain.bo.RmCommissioningClauseBo; +import com.ruoyi.rm.domain.vo.RmCommissioningClauseVo; +import com.ruoyi.rm.mapper.RmCommissioningClauseMapper; +import com.ruoyi.rm.service.IRmCommissioningClauseService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmCommissioningClauseServiceImpl implements IRmCommissioningClauseService { + + private final RmCommissioningClauseMapper baseMapper; + + @Override + public RmCommissioningClauseVo queryById(Long clauseId) { return baseMapper.selectVoById(clauseId); } + + @Override + public TableDataInfo queryPageList(RmCommissioningClauseBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmCommissioningClauseBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmCommissioningClauseBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmCommissioningClause.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmCommissioningClauseBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmCommissioningClause.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmCommissioningClauseBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmCommissioningClause::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmCommissioningClause::getSortOrder); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDashboardServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDashboardServiceImpl.java new file mode 100644 index 0000000..8da3ac0 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDashboardServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.rm.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.rm.domain.entity.*; +import com.ruoyi.rm.mapper.*; +import com.ruoyi.rm.service.IRmDashboardService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +import static com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaQuery; + +@RequiredArgsConstructor +@Service +public class RmDashboardServiceImpl implements IRmDashboardService { + + private final RmBudgetMapper rmBudgetMapper; + private final RmTechPlanItemMapper rmTechPlanItemMapper; + private final RmLayoutFileMapper rmLayoutFileMapper; + private final RmTechReviewItemMapper rmTechReviewItemMapper; + private final RmDrawingDesignMapper rmDrawingDesignMapper; + private final RmDrawingReviewMapper rmDrawingReviewMapper; + private final RmProcurementProgressMapper rmProcurementProgressMapper; + private final RmMfgDeviceMapper rmMfgDeviceMapper; + private final RmDrawingCompareMapper rmDrawingCompareMapper; + private final RmDocLibMapper rmDocLibMapper; + private final RmSiteModMapper rmSiteModMapper; + private final RmShippingChecklistMapper rmShippingChecklistMapper; + private final RmManualMapper rmManualMapper; + private final RmInstallToolMapper rmInstallToolMapper; + private final RmInstallFeedbackMapper rmInstallFeedbackMapper; + private final RmAcceptanceChecklistMapper rmAcceptanceChecklistMapper; + private final RmCommissioningChecklistMapper rmCommissioningChecklistMapper; + private final RmProjectMapper rmProjectMapper; + private final RmProjectMemberMapper rmProjectMemberMapper; + + @Override + public Map getStageStatus(Long projectId) { + // Access check: non-admin users must be manager or member of this project + Long userId = LoginHelper.getUserId(); + if (userId != null && !LoginHelper.isAdmin(userId)) { + RmProject project = rmProjectMapper.selectById(projectId); + if (project == null) { + throw new RuntimeException("项目不存在"); + } + boolean isManager = userId.equals(project.getManagerId()); + boolean isMember = rmProjectMemberMapper.selectCount( + Wrappers.lambdaQuery() + .eq(RmProjectMember::getProjectId, projectId) + .eq(RmProjectMember::getUserId, userId)) > 0; + if (!isManager && !isMember) { + throw new RuntimeException("无权访问此项目"); + } + } + Map r = new HashMap<>(); + r.put("budget", eval(rmBudgetMapper, RmBudget.class, "status", "approved", projectId)); + r.put("tech_plan", has(rmTechPlanItemMapper, RmTechPlanItem.class, projectId)); + r.put("layout", has(rmLayoutFileMapper, RmLayoutFile.class, projectId)); + r.put("tech_review", has(rmTechReviewItemMapper, RmTechReviewItem.class, projectId)); + r.put("drawing_design", eval(rmDrawingDesignMapper, RmDrawingDesign.class, "status", "approved", projectId)); + r.put("drawing_review", eval(rmDrawingReviewMapper, RmDrawingReview.class, "status", "approved", projectId)); + r.put("procurement", has(rmProcurementProgressMapper, RmProcurementProgress.class, projectId)); + r.put("manufacturing", has(rmMfgDeviceMapper, RmMfgDevice.class, projectId)); + r.put("drawing_compare", has(rmDrawingCompareMapper, RmDrawingCompare.class, projectId)); + r.put("doc_lib", has(rmDocLibMapper, RmDocLib.class, projectId)); + r.put("site_mod", has(rmSiteModMapper, RmSiteMod.class, projectId)); + r.put("shipping", eval(rmShippingChecklistMapper, RmShippingChecklist.class, "is_checked", "1", projectId)); + r.put("manuals", has(rmManualMapper, RmManual.class, projectId)); + r.put("install_prep", has(rmInstallToolMapper, RmInstallTool.class, projectId)); + r.put("install_feedback", has(rmInstallFeedbackMapper, RmInstallFeedback.class, projectId)); + r.put("acceptance", eval(rmAcceptanceChecklistMapper, RmAcceptanceChecklist.class, "is_checked", "1", projectId)); + r.put("hot_commissioning", eval(rmCommissioningChecklistMapper, RmCommissioningChecklist.class, "is_checked", "1", projectId)); + return r; + } + + private String has(BaseMapperPlus mapper, Class clazz, Long projectId) { + return mapper.selectCount(lambdaQuery(clazz).apply("project_id = {0}", projectId)) > 0 + ? "progress" : "pending"; + } + + private String eval(BaseMapperPlus mapper, Class clazz, + String statusField, String doneValue, Long projectId) { + long total = mapper.selectCount(lambdaQuery(clazz).apply("project_id = {0}", projectId)); + if (total == 0) return "pending"; + long done = mapper.selectCount(lambdaQuery(clazz) + .apply("project_id = {0}", projectId) + .apply("IFNULL(" + statusField + ",'') = {0}", doneValue)); + return total == done ? "done" : "progress"; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDocLibServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDocLibServiceImpl.java new file mode 100644 index 0000000..b558550 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDocLibServiceImpl.java @@ -0,0 +1,67 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmDocLib; +import com.ruoyi.rm.domain.bo.RmDocLibBo; +import com.ruoyi.rm.domain.vo.RmDocLibVo; +import com.ruoyi.rm.mapper.RmDocLibMapper; +import com.ruoyi.rm.service.IRmDocLibService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmDocLibServiceImpl implements IRmDocLibService { + + private final RmDocLibMapper baseMapper; + + @Override + public RmDocLibVo queryById(Long docId) { return baseMapper.selectVoById(docId); } + + @Override + public TableDataInfo queryPageList(RmDocLibBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmDocLibBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmDocLibBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmDocLib.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmDocLibBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmDocLib.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmDocLibBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmDocLib::getProjectId, bo.getProjectId()); + lqw.like(bo.getDocName() != null, RmDocLib::getDocName, bo.getDocName()); + lqw.eq(bo.getCategory() != null, RmDocLib::getCategory, bo.getCategory()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingCompareServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingCompareServiceImpl.java new file mode 100644 index 0000000..a219b6b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingCompareServiceImpl.java @@ -0,0 +1,73 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmDrawingCompare; +import com.ruoyi.rm.domain.bo.RmDrawingCompareBo; +import com.ruoyi.rm.domain.vo.RmDrawingCompareVo; +import com.ruoyi.rm.mapper.RmDrawingCompareMapper; +import com.ruoyi.rm.service.IRmDrawingCompareService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmDrawingCompareServiceImpl implements IRmDrawingCompareService { + + private final RmDrawingCompareMapper baseMapper; + + @Override + public RmDrawingCompareVo queryById(Long compareId) { + return baseMapper.selectVoById(compareId); + } + + @Override + public TableDataInfo queryPageList(RmDrawingCompareBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmDrawingCompareBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmDrawingCompareBo bo) { + RmDrawingCompare add = BeanUtil.toBean(bo, RmDrawingCompare.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmDrawingCompareBo bo) { + RmDrawingCompare update = BeanUtil.toBean(bo, RmDrawingCompare.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmDrawingCompareBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmDrawingCompare::getProjectId, bo.getProjectId()); + lqw.like(bo.getDrawingName() != null, RmDrawingCompare::getDrawingName, bo.getDrawingName()); + lqw.eq(bo.getStatus() != null, RmDrawingCompare::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallFeedbackServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallFeedbackServiceImpl.java new file mode 100644 index 0000000..7ecec44 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallFeedbackServiceImpl.java @@ -0,0 +1,68 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmInstallFeedback; +import com.ruoyi.rm.domain.bo.RmInstallFeedbackBo; +import com.ruoyi.rm.domain.vo.RmInstallFeedbackVo; +import com.ruoyi.rm.mapper.RmInstallFeedbackMapper; +import com.ruoyi.rm.service.IRmInstallFeedbackService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmInstallFeedbackServiceImpl implements IRmInstallFeedbackService { + + private final RmInstallFeedbackMapper baseMapper; + + @Override + public RmInstallFeedbackVo queryById(Long feedbackId) { return baseMapper.selectVoById(feedbackId); } + + @Override + public TableDataInfo queryPageList(RmInstallFeedbackBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmInstallFeedbackBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmInstallFeedbackBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmInstallFeedback.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmInstallFeedbackBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmInstallFeedback.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmInstallFeedbackBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmInstallFeedback::getProjectId, bo.getProjectId()); + lqw.like(bo.getTitle() != null, RmInstallFeedback::getTitle, bo.getTitle()); + lqw.eq(bo.getStatus() != null, RmInstallFeedback::getStatus, bo.getStatus()); + lqw.orderByDesc(RmInstallFeedback::getFeedbackId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallPersonnelServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallPersonnelServiceImpl.java new file mode 100644 index 0000000..ca4f9f7 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallPersonnelServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmInstallPersonnel; +import com.ruoyi.rm.domain.bo.RmInstallPersonnelBo; +import com.ruoyi.rm.domain.vo.RmInstallPersonnelVo; +import com.ruoyi.rm.mapper.RmInstallPersonnelMapper; +import com.ruoyi.rm.service.IRmInstallPersonnelService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmInstallPersonnelServiceImpl implements IRmInstallPersonnelService { + + private final RmInstallPersonnelMapper baseMapper; + + @Override + public RmInstallPersonnelVo queryById(Long personnelId) { return baseMapper.selectVoById(personnelId); } + + @Override + public TableDataInfo queryPageList(RmInstallPersonnelBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmInstallPersonnelBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmInstallPersonnelBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmInstallPersonnel.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmInstallPersonnelBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmInstallPersonnel.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmInstallPersonnelBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmInstallPersonnel::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmInstallPersonnel::getPersonnelId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallPrecisionServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallPrecisionServiceImpl.java new file mode 100644 index 0000000..a8cf416 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallPrecisionServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmInstallPrecision; +import com.ruoyi.rm.domain.bo.RmInstallPrecisionBo; +import com.ruoyi.rm.domain.vo.RmInstallPrecisionVo; +import com.ruoyi.rm.mapper.RmInstallPrecisionMapper; +import com.ruoyi.rm.service.IRmInstallPrecisionService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmInstallPrecisionServiceImpl implements IRmInstallPrecisionService { + + private final RmInstallPrecisionMapper baseMapper; + + @Override + public RmInstallPrecisionVo queryById(Long precisionId) { return baseMapper.selectVoById(precisionId); } + + @Override + public TableDataInfo queryPageList(RmInstallPrecisionBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmInstallPrecisionBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmInstallPrecisionBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmInstallPrecision.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmInstallPrecisionBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmInstallPrecision.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmInstallPrecisionBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmInstallPrecision::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmInstallPrecision::getPrecisionId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallProgressServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallProgressServiceImpl.java new file mode 100644 index 0000000..ad28787 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallProgressServiceImpl.java @@ -0,0 +1,72 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmInstallProgress; +import com.ruoyi.rm.domain.bo.RmInstallProgressBo; +import com.ruoyi.rm.domain.vo.RmInstallProgressVo; +import com.ruoyi.rm.mapper.RmInstallProgressMapper; +import com.ruoyi.rm.service.IRmInstallProgressService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmInstallProgressServiceImpl implements IRmInstallProgressService { + + private final RmInstallProgressMapper baseMapper; + + @Override + public RmInstallProgressVo queryById(Long progressId) { + return baseMapper.selectVoById(progressId); + } + + @Override + public TableDataInfo queryPageList(RmInstallProgressBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmInstallProgressBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmInstallProgressBo bo) { + RmInstallProgress add = BeanUtil.toBean(bo, RmInstallProgress.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmInstallProgressBo bo) { + RmInstallProgress update = BeanUtil.toBean(bo, RmInstallProgress.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmInstallProgressBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmInstallProgress::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmInstallProgress::getProgressId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallToolServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallToolServiceImpl.java new file mode 100644 index 0000000..8d05452 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmInstallToolServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmInstallTool; +import com.ruoyi.rm.domain.bo.RmInstallToolBo; +import com.ruoyi.rm.domain.vo.RmInstallToolVo; +import com.ruoyi.rm.mapper.RmInstallToolMapper; +import com.ruoyi.rm.service.IRmInstallToolService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmInstallToolServiceImpl implements IRmInstallToolService { + + private final RmInstallToolMapper baseMapper; + + @Override + public RmInstallToolVo queryById(Long toolId) { return baseMapper.selectVoById(toolId); } + + @Override + public TableDataInfo queryPageList(RmInstallToolBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmInstallToolBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmInstallToolBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmInstallTool.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmInstallToolBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmInstallTool.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmInstallToolBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmInstallTool::getProjectId, bo.getProjectId()); + lqw.orderByAsc(RmInstallTool::getToolId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmManualServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmManualServiceImpl.java new file mode 100644 index 0000000..70a2375 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmManualServiceImpl.java @@ -0,0 +1,68 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmManual; +import com.ruoyi.rm.domain.bo.RmManualBo; +import com.ruoyi.rm.domain.vo.RmManualVo; +import com.ruoyi.rm.mapper.RmManualMapper; +import com.ruoyi.rm.service.IRmManualService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmManualServiceImpl implements IRmManualService { + + private final RmManualMapper baseMapper; + + @Override + public RmManualVo queryById(Long manualId) { return baseMapper.selectVoById(manualId); } + + @Override + public TableDataInfo queryPageList(RmManualBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmManualBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmManualBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmManual.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmManualBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmManual.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmManualBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmManual::getProjectId, bo.getProjectId()); + lqw.like(bo.getManualName() != null, RmManual::getManualName, bo.getManualName()); + lqw.eq(bo.getDocType() != null, RmManual::getDocType, bo.getDocType()); + lqw.orderByAsc(RmManual::getManualId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectMemberServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectMemberServiceImpl.java new file mode 100644 index 0000000..df6709a --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectMemberServiceImpl.java @@ -0,0 +1,90 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmProjectMember; +import com.ruoyi.rm.domain.bo.RmProjectMemberBo; +import com.ruoyi.rm.domain.vo.RmProjectMemberVo; +import com.ruoyi.rm.mapper.RmProjectMemberMapper; +import com.ruoyi.rm.service.IRmProjectMemberService; +import com.ruoyi.system.mapper.SysUserMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmProjectMemberServiceImpl implements IRmProjectMemberService { + + private final RmProjectMemberMapper baseMapper; + private final SysUserMapper sysUserMapper; + + @Override + public RmProjectMemberVo queryById(Long memberId) { + RmProjectMemberVo vo = baseMapper.selectVoById(memberId); + populateUserName(vo); + return vo; + } + + @Override + public TableDataInfo queryPageList(RmProjectMemberBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::populateUserName); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmProjectMemberBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List list = baseMapper.selectVoList(lqw); + list.forEach(this::populateUserName); + return list; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmProjectMemberBo bo) { + RmProjectMember add = BeanUtil.toBean(bo, RmProjectMember.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmProjectMemberBo bo) { + RmProjectMember update = BeanUtil.toBean(bo, RmProjectMember.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmProjectMemberBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmProjectMember::getProjectId, bo.getProjectId()); + lqw.eq(bo.getUserId() != null, RmProjectMember::getUserId, bo.getUserId()); + lqw.eq(bo.getRole() != null, RmProjectMember::getRole, bo.getRole()); + return lqw; + } + + private void populateUserName(RmProjectMemberVo vo) { + if (vo != null && vo.getUserId() != null) { + SysUser user = sysUserMapper.selectUserById(vo.getUserId()); + if (user != null) { + vo.setUserName(user.getNickName()); + } + } + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java index 4ad3dd2..9aab98d 100644 --- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java @@ -5,12 +5,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.rm.domain.entity.RmProject; import com.ruoyi.rm.domain.bo.RmProjectBo; import com.ruoyi.rm.domain.vo.RmProjectVo; import com.ruoyi.rm.mapper.RmProjectMapper; +import com.ruoyi.rm.mapper.RmProjectMemberMapper; import com.ruoyi.rm.service.IRmProjectService; +import com.ruoyi.system.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,29 +27,37 @@ import java.util.List; public class RmProjectServiceImpl implements IRmProjectService { private final RmProjectMapper baseMapper; + private final SysUserMapper sysUserMapper; + private final RmProjectMemberMapper rmProjectMemberMapper; @Override public RmProjectVo queryById(Long projectId) { - return baseMapper.selectVoById(projectId); + RmProjectVo vo = baseMapper.selectVoById(projectId); + populateManagerName(vo); + return vo; } @Override public TableDataInfo queryPageList(RmProjectBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(this::populateManagerName); return TableDataInfo.build(result); } @Override public List queryList(RmProjectBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + List list = baseMapper.selectVoList(lqw); + list.forEach(this::populateManagerName); + return list; } @Override @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(RmProjectBo bo) { RmProject add = BeanUtil.toBean(bo, RmProject.class); + resolveManagerName(add); return baseMapper.insert(add) > 0; } @@ -53,6 +65,7 @@ public class RmProjectServiceImpl implements IRmProjectService { @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(RmProjectBo bo) { RmProject update = BeanUtil.toBean(bo, RmProject.class); + resolveManagerName(update); return baseMapper.updateById(update) > 0; } @@ -70,6 +83,31 @@ public class RmProjectServiceImpl implements IRmProjectService { lqw.eq(bo.getClientName() != null, RmProject::getClientName, bo.getClientName()); lqw.eq(bo.getManager() != null, RmProject::getManager, bo.getManager()); lqw.eq(bo.getStatus() != null, RmProject::getStatus, bo.getStatus()); + // User-based access filtering: non-admin users only see projects they own or are members of + Long currentUserId = LoginHelper.getUserId(); + if (currentUserId != null && !LoginHelper.isAdmin(currentUserId)) { + lqw.and(w -> w.eq(RmProject::getManagerId, currentUserId) + .or() + .apply("project_id IN (SELECT project_id FROM fad_rm_project_member WHERE user_id = {0} AND del_flag = 0)", currentUserId)); + } return lqw; } + + private void resolveManagerName(RmProject entity) { + if (entity.getManagerId() != null) { + SysUser user = sysUserMapper.selectUserById(entity.getManagerId()); + if (user != null) { + entity.setManager(user.getNickName()); + } + } + } + + private void populateManagerName(RmProjectVo vo) { + if (vo != null && vo.getManagerId() != null) { + SysUser user = sysUserMapper.selectUserById(vo.getManagerId()); + if (user != null) { + vo.setManagerName(user.getNickName()); + } + } + } } diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmShippingChecklistServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmShippingChecklistServiceImpl.java new file mode 100644 index 0000000..12fd358 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmShippingChecklistServiceImpl.java @@ -0,0 +1,68 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmShippingChecklist; +import com.ruoyi.rm.domain.bo.RmShippingChecklistBo; +import com.ruoyi.rm.domain.vo.RmShippingChecklistVo; +import com.ruoyi.rm.mapper.RmShippingChecklistMapper; +import com.ruoyi.rm.service.IRmShippingChecklistService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmShippingChecklistServiceImpl implements IRmShippingChecklistService { + + private final RmShippingChecklistMapper baseMapper; + + @Override + public RmShippingChecklistVo queryById(Long checklistId) { return baseMapper.selectVoById(checklistId); } + + @Override + public TableDataInfo queryPageList(RmShippingChecklistBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmShippingChecklistBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmShippingChecklistBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmShippingChecklist.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmShippingChecklistBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmShippingChecklist.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmShippingChecklistBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmShippingChecklist::getProjectId, bo.getProjectId()); + lqw.like(bo.getItemText() != null, RmShippingChecklist::getItemText, bo.getItemText()); + lqw.eq(bo.getIsChecked() != null, RmShippingChecklist::getIsChecked, bo.getIsChecked()); + lqw.orderByAsc(RmShippingChecklist::getSortOrder); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmShippingItemServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmShippingItemServiceImpl.java new file mode 100644 index 0000000..e5d99dc --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmShippingItemServiceImpl.java @@ -0,0 +1,68 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmShippingItem; +import com.ruoyi.rm.domain.bo.RmShippingItemBo; +import com.ruoyi.rm.domain.vo.RmShippingItemVo; +import com.ruoyi.rm.mapper.RmShippingItemMapper; +import com.ruoyi.rm.service.IRmShippingItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmShippingItemServiceImpl implements IRmShippingItemService { + + private final RmShippingItemMapper baseMapper; + + @Override + public RmShippingItemVo queryById(Long itemId) { return baseMapper.selectVoById(itemId); } + + @Override + public TableDataInfo queryPageList(RmShippingItemBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmShippingItemBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmShippingItemBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmShippingItem.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmShippingItemBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmShippingItem.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmShippingItemBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmShippingItem::getProjectId, bo.getProjectId()); + lqw.like(bo.getDeviceName() != null, RmShippingItem::getDeviceName, bo.getDeviceName()); + lqw.eq(bo.getStatus() != null, RmShippingItem::getStatus, bo.getStatus()); + lqw.orderByAsc(RmShippingItem::getItemId); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmSiteModMediaServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmSiteModMediaServiceImpl.java new file mode 100644 index 0000000..428ca22 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmSiteModMediaServiceImpl.java @@ -0,0 +1,59 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmSiteModMedia; +import com.ruoyi.rm.domain.bo.RmSiteModMediaBo; +import com.ruoyi.rm.domain.vo.RmSiteModMediaVo; +import com.ruoyi.rm.mapper.RmSiteModMediaMapper; +import com.ruoyi.rm.service.IRmSiteModMediaService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmSiteModMediaServiceImpl implements IRmSiteModMediaService { + + private final RmSiteModMediaMapper baseMapper; + + @Override + public RmSiteModMediaVo queryById(Long mediaId) { return baseMapper.selectVoById(mediaId); } + + @Override + public TableDataInfo queryPageList(RmSiteModMediaBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmSiteModMediaBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmSiteModMediaBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmSiteModMedia.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmSiteModMediaBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getModId() != null, RmSiteModMedia::getModId, bo.getModId()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmSiteModServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmSiteModServiceImpl.java new file mode 100644 index 0000000..8c5db88 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmSiteModServiceImpl.java @@ -0,0 +1,67 @@ +package com.ruoyi.rm.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmSiteMod; +import com.ruoyi.rm.domain.bo.RmSiteModBo; +import com.ruoyi.rm.domain.vo.RmSiteModVo; +import com.ruoyi.rm.mapper.RmSiteModMapper; +import com.ruoyi.rm.service.IRmSiteModService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmSiteModServiceImpl implements IRmSiteModService { + + private final RmSiteModMapper baseMapper; + + @Override + public RmSiteModVo queryById(Long modId) { return baseMapper.selectVoById(modId); } + + @Override + public TableDataInfo queryPageList(RmSiteModBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmSiteModBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmSiteModBo bo) { + return baseMapper.insert(BeanUtil.toBean(bo, RmSiteMod.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmSiteModBo bo) { + return baseMapper.updateById(BeanUtil.toBean(bo, RmSiteMod.class)) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmSiteModBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmSiteMod::getProjectId, bo.getProjectId()); + lqw.eq(bo.getDeviceName() != null, RmSiteMod::getDeviceName, bo.getDeviceName()); + lqw.eq(bo.getStatus() != null, RmSiteMod::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/ruoyi-ui/src/api/rm/acceptanceChecklist.js b/ruoyi-ui/src/api/rm/acceptanceChecklist.js new file mode 100644 index 0000000..35561cb --- /dev/null +++ b/ruoyi-ui/src/api/rm/acceptanceChecklist.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listAcceptanceChecklist(query) { return request({ url: '/rm/acceptanceChecklist/list', method: 'get', params: query }) } +export function getAcceptanceChecklist(checkId) { return request({ url: `/rm/acceptanceChecklist/${checkId}`, method: 'get' }) } +export function addAcceptanceChecklist(data) { return request({ url: '/rm/acceptanceChecklist', method: 'post', data }) } +export function updateAcceptanceChecklist(data) { return request({ url: '/rm/acceptanceChecklist', method: 'put', data }) } +export function delAcceptanceChecklist(checkIds) { return request({ url: `/rm/acceptanceChecklist/${checkIds}`, method: 'delete' }) } +export function listAcceptanceChecklistAll(query) { return request({ url: '/rm/acceptanceChecklist/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/acceptanceItem.js b/ruoyi-ui/src/api/rm/acceptanceItem.js new file mode 100644 index 0000000..8d5b1aa --- /dev/null +++ b/ruoyi-ui/src/api/rm/acceptanceItem.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listAcceptanceItem(query) { return request({ url: '/rm/acceptanceItem/list', method: 'get', params: query }) } +export function getAcceptanceItem(acceptItemId) { return request({ url: `/rm/acceptanceItem/${acceptItemId}`, method: 'get' }) } +export function addAcceptanceItem(data) { return request({ url: '/rm/acceptanceItem', method: 'post', data }) } +export function updateAcceptanceItem(data) { return request({ url: '/rm/acceptanceItem', method: 'put', data }) } +export function delAcceptanceItem(acceptItemIds) { return request({ url: `/rm/acceptanceItem/${acceptItemIds}`, method: 'delete' }) } +export function listAcceptanceItemAll(query) { return request({ url: '/rm/acceptanceItem/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/commissioningChecklist.js b/ruoyi-ui/src/api/rm/commissioningChecklist.js new file mode 100644 index 0000000..0f67c44 --- /dev/null +++ b/ruoyi-ui/src/api/rm/commissioningChecklist.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listCommissioningChecklist(query) { return request({ url: '/rm/commissioningChecklist/list', method: 'get', params: query }) } +export function getCommissioningChecklist(checkId) { return request({ url: `/rm/commissioningChecklist/${checkId}`, method: 'get' }) } +export function addCommissioningChecklist(data) { return request({ url: '/rm/commissioningChecklist', method: 'post', data }) } +export function updateCommissioningChecklist(data) { return request({ url: '/rm/commissioningChecklist', method: 'put', data }) } +export function delCommissioningChecklist(checkIds) { return request({ url: `/rm/commissioningChecklist/${checkIds}`, method: 'delete' }) } +export function listCommissioningChecklistAll(query) { return request({ url: '/rm/commissioningChecklist/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/commissioningClause.js b/ruoyi-ui/src/api/rm/commissioningClause.js new file mode 100644 index 0000000..c76504d --- /dev/null +++ b/ruoyi-ui/src/api/rm/commissioningClause.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listCommissioningClause(query) { return request({ url: '/rm/commissioningClause/list', method: 'get', params: query }) } +export function getCommissioningClause(clauseId) { return request({ url: `/rm/commissioningClause/${clauseId}`, method: 'get' }) } +export function addCommissioningClause(data) { return request({ url: '/rm/commissioningClause', method: 'post', data }) } +export function updateCommissioningClause(data) { return request({ url: '/rm/commissioningClause', method: 'put', data }) } +export function delCommissioningClause(clauseIds) { return request({ url: `/rm/commissioningClause/${clauseIds}`, method: 'delete' }) } +export function listCommissioningClauseAll(query) { return request({ url: '/rm/commissioningClause/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/dashboard.js b/ruoyi-ui/src/api/rm/dashboard.js new file mode 100644 index 0000000..01d8815 --- /dev/null +++ b/ruoyi-ui/src/api/rm/dashboard.js @@ -0,0 +1,3 @@ +import request from '@/utils/request' + +export function getStageStatus(projectId) { return request({ url: `/rm/dashboard/stageStatus/${projectId}`, method: 'get' }) } diff --git a/ruoyi-ui/src/api/rm/docLib.js b/ruoyi-ui/src/api/rm/docLib.js new file mode 100644 index 0000000..cdfc0f6 --- /dev/null +++ b/ruoyi-ui/src/api/rm/docLib.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listDocLib(query) { return request({ url: '/rm/docLib/list', method: 'get', params: query }) } +export function getDocLib(docId) { return request({ url: `/rm/docLib/${docId}`, method: 'get' }) } +export function addDocLib(data) { return request({ url: '/rm/docLib', method: 'post', data }) } +export function updateDocLib(data) { return request({ url: '/rm/docLib', method: 'put', data }) } +export function delDocLib(docIds) { return request({ url: `/rm/docLib/${docIds}`, method: 'delete' }) } +export function listDocLibAll(query) { return request({ url: '/rm/docLib/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/drawingCompare.js b/ruoyi-ui/src/api/rm/drawingCompare.js new file mode 100644 index 0000000..425750a --- /dev/null +++ b/ruoyi-ui/src/api/rm/drawingCompare.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listDrawingCompare(query) { return request({ url: '/rm/drawingCompare/list', method: 'get', params: query }) } +export function getDrawingCompare(compareId) { return request({ url: `/rm/drawingCompare/${compareId}`, method: 'get' }) } +export function addDrawingCompare(data) { return request({ url: '/rm/drawingCompare', method: 'post', data }) } +export function updateDrawingCompare(data) { return request({ url: '/rm/drawingCompare', method: 'put', data }) } +export function delDrawingCompare(compareIds) { return request({ url: `/rm/drawingCompare/${compareIds}`, method: 'delete' }) } +export function listDrawingCompareAll(query) { return request({ url: '/rm/drawingCompare/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/drawingReview.js b/ruoyi-ui/src/api/rm/drawingReview.js index d1dc77c..c8ed1d5 100644 --- a/ruoyi-ui/src/api/rm/drawingReview.js +++ b/ruoyi-ui/src/api/rm/drawingReview.js @@ -37,3 +37,11 @@ export function delDrawingReview(reviewIds) { method: 'delete' }) } + +export function listDrawingReviewAll(query) { + return request({ + url: '/rm/drawingReview/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/installFeedback.js b/ruoyi-ui/src/api/rm/installFeedback.js new file mode 100644 index 0000000..9290310 --- /dev/null +++ b/ruoyi-ui/src/api/rm/installFeedback.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listInstallFeedback(query) { return request({ url: '/rm/installFeedback/list', method: 'get', params: query }) } +export function getInstallFeedback(feedbackId) { return request({ url: `/rm/installFeedback/${feedbackId}`, method: 'get' }) } +export function addInstallFeedback(data) { return request({ url: '/rm/installFeedback', method: 'post', data }) } +export function updateInstallFeedback(data) { return request({ url: '/rm/installFeedback', method: 'put', data }) } +export function delInstallFeedback(feedbackIds) { return request({ url: `/rm/installFeedback/${feedbackIds}`, method: 'delete' }) } +export function listInstallFeedbackAll(query) { return request({ url: '/rm/installFeedback/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/installPersonnel.js b/ruoyi-ui/src/api/rm/installPersonnel.js new file mode 100644 index 0000000..17c72b4 --- /dev/null +++ b/ruoyi-ui/src/api/rm/installPersonnel.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listInstallPersonnel(query) { return request({ url: '/rm/installPersonnel/list', method: 'get', params: query }) } +export function getInstallPersonnel(personnelId) { return request({ url: `/rm/installPersonnel/${personnelId}`, method: 'get' }) } +export function addInstallPersonnel(data) { return request({ url: '/rm/installPersonnel', method: 'post', data }) } +export function updateInstallPersonnel(data) { return request({ url: '/rm/installPersonnel', method: 'put', data }) } +export function delInstallPersonnel(personnelIds) { return request({ url: `/rm/installPersonnel/${personnelIds}`, method: 'delete' }) } +export function listInstallPersonnelAll(query) { return request({ url: '/rm/installPersonnel/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/installPrecision.js b/ruoyi-ui/src/api/rm/installPrecision.js new file mode 100644 index 0000000..1d7c0a3 --- /dev/null +++ b/ruoyi-ui/src/api/rm/installPrecision.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listInstallPrecision(query) { return request({ url: '/rm/installPrecision/list', method: 'get', params: query }) } +export function getInstallPrecision(precisionId) { return request({ url: `/rm/installPrecision/${precisionId}`, method: 'get' }) } +export function addInstallPrecision(data) { return request({ url: '/rm/installPrecision', method: 'post', data }) } +export function updateInstallPrecision(data) { return request({ url: '/rm/installPrecision', method: 'put', data }) } +export function delInstallPrecision(precisionIds) { return request({ url: `/rm/installPrecision/${precisionIds}`, method: 'delete' }) } +export function listInstallPrecisionAll(query) { return request({ url: '/rm/installPrecision/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/installProgress.js b/ruoyi-ui/src/api/rm/installProgress.js new file mode 100644 index 0000000..e9bbe7c --- /dev/null +++ b/ruoyi-ui/src/api/rm/installProgress.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listInstallProgress(query) { return request({ url: '/rm/installProgress/list', method: 'get', params: query }) } +export function getInstallProgress(progressId) { return request({ url: `/rm/installProgress/${progressId}`, method: 'get' }) } +export function addInstallProgress(data) { return request({ url: '/rm/installProgress', method: 'post', data }) } +export function updateInstallProgress(data) { return request({ url: '/rm/installProgress', method: 'put', data }) } +export function delInstallProgress(progressIds) { return request({ url: `/rm/installProgress/${progressIds}`, method: 'delete' }) } +export function listInstallProgressAll(query) { return request({ url: '/rm/installProgress/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/installTool.js b/ruoyi-ui/src/api/rm/installTool.js new file mode 100644 index 0000000..cc15d72 --- /dev/null +++ b/ruoyi-ui/src/api/rm/installTool.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listInstallTool(query) { return request({ url: '/rm/installTool/list', method: 'get', params: query }) } +export function getInstallTool(toolId) { return request({ url: `/rm/installTool/${toolId}`, method: 'get' }) } +export function addInstallTool(data) { return request({ url: '/rm/installTool', method: 'post', data }) } +export function updateInstallTool(data) { return request({ url: '/rm/installTool', method: 'put', data }) } +export function delInstallTool(toolIds) { return request({ url: `/rm/installTool/${toolIds}`, method: 'delete' }) } +export function listInstallToolAll(query) { return request({ url: '/rm/installTool/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/layoutFile.js b/ruoyi-ui/src/api/rm/layoutFile.js index 0fe9a9c..c68f171 100644 --- a/ruoyi-ui/src/api/rm/layoutFile.js +++ b/ruoyi-ui/src/api/rm/layoutFile.js @@ -37,3 +37,11 @@ export function delLayoutFile(layoutFileIds) { method: 'delete' }) } + +export function listLayoutFileAll(query) { + return request({ + url: '/rm/layout/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/manual.js b/ruoyi-ui/src/api/rm/manual.js new file mode 100644 index 0000000..08809c3 --- /dev/null +++ b/ruoyi-ui/src/api/rm/manual.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listManual(query) { return request({ url: '/rm/manual/list', method: 'get', params: query }) } +export function getManual(manualId) { return request({ url: `/rm/manual/${manualId}`, method: 'get' }) } +export function addManual(data) { return request({ url: '/rm/manual', method: 'post', data }) } +export function updateManual(data) { return request({ url: '/rm/manual', method: 'put', data }) } +export function delManual(manualIds) { return request({ url: `/rm/manual/${manualIds}`, method: 'delete' }) } +export function listManualAll(query) { return request({ url: '/rm/manual/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/projectMember.js b/ruoyi-ui/src/api/rm/projectMember.js new file mode 100644 index 0000000..b0929e3 --- /dev/null +++ b/ruoyi-ui/src/api/rm/projectMember.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function listProjectMember(query) { + return request({ + url: '/rm/projectMember/list', + method: 'get', + params: query + }) +} + +export function getProjectMember(memberId) { + return request({ + url: `/rm/projectMember/${memberId}`, + method: 'get' + }) +} + +export function addProjectMember(data) { + return request({ + url: '/rm/projectMember', + method: 'post', + data + }) +} + +export function updateProjectMember(data) { + return request({ + url: '/rm/projectMember', + method: 'put', + data + }) +} + +export function delProjectMember(memberIds) { + return request({ + url: `/rm/projectMember/${memberIds}`, + method: 'delete' + }) +} + +export function allProjectMember(query) { + return request({ + url: '/rm/projectMember/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/shippingChecklist.js b/ruoyi-ui/src/api/rm/shippingChecklist.js new file mode 100644 index 0000000..7063cfb --- /dev/null +++ b/ruoyi-ui/src/api/rm/shippingChecklist.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listShippingChecklist(query) { return request({ url: '/rm/shippingChecklist/list', method: 'get', params: query }) } +export function getShippingChecklist(checklistId) { return request({ url: `/rm/shippingChecklist/${checklistId}`, method: 'get' }) } +export function addShippingChecklist(data) { return request({ url: '/rm/shippingChecklist', method: 'post', data }) } +export function updateShippingChecklist(data) { return request({ url: '/rm/shippingChecklist', method: 'put', data }) } +export function delShippingChecklist(checklistIds) { return request({ url: `/rm/shippingChecklist/${checklistIds}`, method: 'delete' }) } +export function listShippingChecklistAll(query) { return request({ url: '/rm/shippingChecklist/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/shippingItem.js b/ruoyi-ui/src/api/rm/shippingItem.js new file mode 100644 index 0000000..045d692 --- /dev/null +++ b/ruoyi-ui/src/api/rm/shippingItem.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function listShippingItem(query) { return request({ url: '/rm/shippingItem/list', method: 'get', params: query }) } +export function getShippingItem(itemId) { return request({ url: `/rm/shippingItem/${itemId}`, method: 'get' }) } +export function addShippingItem(data) { return request({ url: '/rm/shippingItem', method: 'post', data }) } +export function updateShippingItem(data) { return request({ url: '/rm/shippingItem', method: 'put', data }) } +export function delShippingItem(itemIds) { return request({ url: `/rm/shippingItem/${itemIds}`, method: 'delete' }) } +export function listShippingItemAll(query) { return request({ url: '/rm/shippingItem/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/siteMod.js b/ruoyi-ui/src/api/rm/siteMod.js new file mode 100644 index 0000000..6cf52cf --- /dev/null +++ b/ruoyi-ui/src/api/rm/siteMod.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +export function listSiteMod(query) { return request({ url: '/rm/siteMod/list', method: 'get', params: query }) } +export function getSiteMod(modId) { return request({ url: `/rm/siteMod/${modId}`, method: 'get' }) } +export function addSiteMod(data) { return request({ url: '/rm/siteMod', method: 'post', data }) } +export function updateSiteMod(data) { return request({ url: '/rm/siteMod', method: 'put', data }) } +export function delSiteMod(modIds) { return request({ url: `/rm/siteMod/${modIds}`, method: 'delete' }) } +export function listSiteModAll(query) { return request({ url: '/rm/siteMod/all', method: 'get', params: query }) } + +export function listSiteModMedia(query) { return request({ url: '/rm/siteModMedia/list', method: 'get', params: query }) } +export function addSiteModMedia(data) { return request({ url: '/rm/siteModMedia', method: 'post', data }) } +export function delSiteModMedia(mediaIds) { return request({ url: `/rm/siteModMedia/${mediaIds}`, method: 'delete' }) } +export function listSiteModMediaAll(query) { return request({ url: '/rm/siteModMedia/all', method: 'get', params: query }) } diff --git a/ruoyi-ui/src/api/rm/techPlan.js b/ruoyi-ui/src/api/rm/techPlan.js index 693c2a1..a9f1ab2 100644 --- a/ruoyi-ui/src/api/rm/techPlan.js +++ b/ruoyi-ui/src/api/rm/techPlan.js @@ -37,3 +37,11 @@ export function delTechPlan(planItemIds) { method: 'delete' }) } + +export function listTechPlanAll(query) { + return request({ + url: '/rm/techPlan/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss index 2f078b1..44a804d 100644 --- a/ruoyi-ui/src/assets/styles/index.scss +++ b/ruoyi-ui/src/assets/styles/index.scss @@ -240,6 +240,17 @@ body { box-shadow: 0 1px 2px rgba(0, 21, 41, 0.04); } +.current-project-bar { + background: #e8f4fd; + padding: 6px 14px; + font-size: 12px; + color: #2176ae; + border-bottom: 1px solid #d0e8f8; + margin: -1px -1px 0 -1px; + border-radius: 8px 8px 0 0; + font-weight: 500; +} + // 圆角按钮/输入框 .el-input__inner, .el-textarea__inner { diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/ruoyi-ui/src/assets/styles/variables.scss index a714740..26099b6 100644 --- a/ruoyi-ui/src/assets/styles/variables.scss +++ b/ruoyi-ui/src/assets/styles/variables.scss @@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17; $base-sub-menu-hover:#001528; */ -$base-sidebar-width: 150px; +$base-sidebar-width: 180px; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass diff --git a/ruoyi-ui/src/views/rm/acceptance/index.vue b/ruoyi-ui/src/views/rm/acceptance/index.vue new file mode 100644 index 0000000..2058bd0 --- /dev/null +++ b/ruoyi-ui/src/views/rm/acceptance/index.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/budget/index.vue b/ruoyi-ui/src/views/rm/budget/index.vue index bf845b0..6b5667d 100644 --- a/ruoyi-ui/src/views/rm/budget/index.vue +++ b/ruoyi-ui/src/views/rm/budget/index.vue @@ -1,5 +1,6 @@