diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java deleted file mode 100644 index 8c2df4f..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.resource; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 在用软件管理-软件一览表-历史变更记录 前端控制器 - *

- * - * @author wangpeng - * @since 2023-10-09 - */ -@RestController -@RequestMapping("/resource/software/changeLog") -public class BizResourceSoftwareChangeLogController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java deleted file mode 100644 index 8c2df4f..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.resource; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 在用软件管理-软件一览表-历史变更记录 前端控制器 - *

- * - * @author wangpeng - * @since 2023-10-09 - */ -@RestController -@RequestMapping("/resource/software/changeLog") -public class BizResourceSoftwareChangeLogController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java index 165013f..cce5bb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java @@ -29,7 +29,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件一览表") +@Api(tags = "在用软件管理-软件一览表") @RestController @RequestMapping("/resource/softwareInfo") public class BizResourceSoftwareInfoController extends ExportController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java deleted file mode 100644 index 8c2df4f..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.resource; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 在用软件管理-软件一览表-历史变更记录 前端控制器 - *

- * - * @author wangpeng - * @since 2023-10-09 - */ -@RestController -@RequestMapping("/resource/software/changeLog") -public class BizResourceSoftwareChangeLogController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java index 165013f..cce5bb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java @@ -29,7 +29,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件一览表") +@Api(tags = "在用软件管理-软件一览表") @RestController @RequestMapping("/resource/softwareInfo") public class BizResourceSoftwareInfoController extends ExportController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java index 72e36b6..e82689b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java @@ -30,7 +30,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件评审报告") +@Api(tags = "在用软件管理-软件评审报告") @RestController @RequestMapping("/resource/software/reviewReport") public class BizResourceSoftwareReviewReportController extends GeneralApprovalController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java deleted file mode 100644 index 8c2df4f..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.resource; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 在用软件管理-软件一览表-历史变更记录 前端控制器 - *

- * - * @author wangpeng - * @since 2023-10-09 - */ -@RestController -@RequestMapping("/resource/software/changeLog") -public class BizResourceSoftwareChangeLogController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java index 165013f..cce5bb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java @@ -29,7 +29,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件一览表") +@Api(tags = "在用软件管理-软件一览表") @RestController @RequestMapping("/resource/softwareInfo") public class BizResourceSoftwareInfoController extends ExportController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java index 72e36b6..e82689b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java @@ -30,7 +30,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件评审报告") +@Api(tags = "在用软件管理-软件评审报告") @RestController @RequestMapping("/resource/software/reviewReport") public class BizResourceSoftwareReviewReportController extends GeneralApprovalController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java index 1d29514..0b3c3bd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java @@ -27,7 +27,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件修订申请") +@Api(tags = "在用软件管理-软件修订申请") @RestController @RequestMapping("/resource/software/revisionApply") public class BizResourceSoftwareRevisionApplyController extends GeneralApprovalController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java deleted file mode 100644 index 8c2df4f..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareChangeLogController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.resource; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 在用软件管理-软件一览表-历史变更记录 前端控制器 - *

- * - * @author wangpeng - * @since 2023-10-09 - */ -@RestController -@RequestMapping("/resource/software/changeLog") -public class BizResourceSoftwareChangeLogController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java index 165013f..cce5bb5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareInfoController.java @@ -29,7 +29,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件一览表") +@Api(tags = "在用软件管理-软件一览表") @RestController @RequestMapping("/resource/softwareInfo") public class BizResourceSoftwareInfoController extends ExportController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java index 72e36b6..e82689b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareReviewReportController.java @@ -30,7 +30,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件评审报告") +@Api(tags = "在用软件管理-软件评审报告") @RestController @RequestMapping("/resource/software/reviewReport") public class BizResourceSoftwareReviewReportController extends GeneralApprovalController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java index 1d29514..0b3c3bd 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceSoftwareRevisionApplyController.java @@ -27,7 +27,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Api(tags = "文件管理-软件修订申请") +@Api(tags = "在用软件管理-软件修订申请") @RestController @RequestMapping("/resource/software/revisionApply") public class BizResourceSoftwareRevisionApplyController extends GeneralApprovalController { diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportStaffMapper.xml index 4fa206e..e4353c1 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportStaffMapper.xml @@ -15,7 +15,7 @@ - SELECT brsrrs.*, brsi.staff_name, brsi.title_experience + SELECT brsrrs.*, brsi.staff_name, brsi.title_experience, brsi.staff_no, brsi.dept_name FROM biz_resource_software_review_report_staff brsrrs JOIN biz_resource_staff_info brsi ON brsrrs.staff_id = brsi.id WHERE brsrrs.report_id = #{reportId} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSoftwareReviewReportStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSoftwareReviewReportStaff.java index e762214..646052a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSoftwareReviewReportStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceSoftwareReviewReportStaff.java @@ -47,4 +47,12 @@ @ApiModelProperty(value = "职称/时间", dataType = "String") @TableField(exist = false) private String titleExperience; + + @ApiModelProperty(value = "工作部门", dataType = "String") + @TableField(exist = false) + private String deptName; + + @ApiModelProperty(value = "人员编号", dataType = "String") + @TableField(exist = false) + private String staffNo; }