diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java deleted file mode 100644 index c9502d5..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-计量文件关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-file-relation") -public class BusinessOriginalRecordFileRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java deleted file mode 100644 index c9502d5..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-计量文件关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-file-relation") -public class BusinessOriginalRecordFileRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 3129b39..42f20b0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -87,7 +87,7 @@ /** * 设备检修保养验收单删除 */ - @ApiOperation("设设备检修保养验收单审批操作-删除") + @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { @@ -95,9 +95,9 @@ } /** - * 设设备检修保养验收单编辑 + * 设备检修保养验收单编辑 */ - @ApiOperation("设设备检修保养验收单编辑") + @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { @@ -105,9 +105,9 @@ } /** - * 设设备检修保养验收单导出 + * 设备检修保养验收单导出 */ - @ApiOperation("设设备检修保养验收单导出") + @ApiOperation("设备检修保养验收单导出") @PostMapping("/exportList") @ResponseBody public void exportList(@RequestBody AcceptanceCheckRequest request, HttpServletResponse response) throws Exception{ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java deleted file mode 100644 index c9502d5..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-计量文件关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-file-relation") -public class BusinessOriginalRecordFileRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 3129b39..42f20b0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -87,7 +87,7 @@ /** * 设备检修保养验收单删除 */ - @ApiOperation("设设备检修保养验收单审批操作-删除") + @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { @@ -95,9 +95,9 @@ } /** - * 设设备检修保养验收单编辑 + * 设备检修保养验收单编辑 */ - @ApiOperation("设设备检修保养验收单编辑") + @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { @@ -105,9 +105,9 @@ } /** - * 设设备检修保养验收单导出 + * 设备检修保养验收单导出 */ - @ApiOperation("设设备检修保养验收单导出") + @ApiOperation("设备检修保养验收单导出") @PostMapping("/exportList") @ResponseBody public void exportList(@RequestBody AcceptanceCheckRequest request, HttpServletResponse response) throws Exception{ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 3313687..4a35f01 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -5,6 +5,8 @@ + + @@ -19,7 +21,7 @@ - id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time + id, template_code, sample_type_id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java deleted file mode 100644 index c9502d5..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-计量文件关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-file-relation") -public class BusinessOriginalRecordFileRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 3129b39..42f20b0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -87,7 +87,7 @@ /** * 设备检修保养验收单删除 */ - @ApiOperation("设设备检修保养验收单审批操作-删除") + @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { @@ -95,9 +95,9 @@ } /** - * 设设备检修保养验收单编辑 + * 设备检修保养验收单编辑 */ - @ApiOperation("设设备检修保养验收单编辑") + @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { @@ -105,9 +105,9 @@ } /** - * 设设备检修保养验收单导出 + * 设备检修保养验收单导出 */ - @ApiOperation("设设备检修保养验收单导出") + @ApiOperation("设备检修保养验收单导出") @PostMapping("/exportList") @ResponseBody public void exportList(@RequestBody AcceptanceCheckRequest request, HttpServletResponse response) throws Exception{ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 3313687..4a35f01 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -5,6 +5,8 @@ + + @@ -19,7 +21,7 @@ - id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time + id, template_code, sample_type_id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java index 66ed59e..576ee08 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -25,7 +25,19 @@ private Long id; /** - * 样品id + * 模板编码(同一实验室列表的多个记录模板编码相同) + */ + @TableField("template_code") + private String templateCode; + + /** + * 模板所属分类id(备用,用于按分类推荐实验室列表) + */ + @TableField("template_type_id") + private Long sampleTypeId; + + /** + * 样品id(备用) */ @TableField("sample_id") private Long sampleId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java deleted file mode 100644 index c9502d5..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-计量文件关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-file-relation") -public class BusinessOriginalRecordFileRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 3129b39..42f20b0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -87,7 +87,7 @@ /** * 设备检修保养验收单删除 */ - @ApiOperation("设设备检修保养验收单审批操作-删除") + @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { @@ -95,9 +95,9 @@ } /** - * 设设备检修保养验收单编辑 + * 设备检修保养验收单编辑 */ - @ApiOperation("设设备检修保养验收单编辑") + @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { @@ -105,9 +105,9 @@ } /** - * 设设备检修保养验收单导出 + * 设备检修保养验收单导出 */ - @ApiOperation("设设备检修保养验收单导出") + @ApiOperation("设备检修保养验收单导出") @PostMapping("/exportList") @ResponseBody public void exportList(@RequestBody AcceptanceCheckRequest request, HttpServletResponse response) throws Exception{ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 3313687..4a35f01 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -5,6 +5,8 @@ + + @@ -19,7 +21,7 @@ - id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time + id, template_code, sample_type_id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java index 66ed59e..576ee08 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -25,7 +25,19 @@ private Long id; /** - * 样品id + * 模板编码(同一实验室列表的多个记录模板编码相同) + */ + @TableField("template_code") + private String templateCode; + + /** + * 模板所属分类id(备用,用于按分类推荐实验室列表) + */ + @TableField("template_type_id") + private Long sampleTypeId; + + /** + * 样品id(备用) */ @TableField("sample_id") private Long sampleId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 1b674ba..bef098c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -9,9 +9,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.AcceptanceCheck; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.dto.equipment.AcceptanceCheckRequest; -import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; +import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.EquipmentApplyTypeEnum; import com.casic.missiles.enums.ExportEnum; @@ -22,14 +21,12 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentApplyFileService; -import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import javassist.expr.NewArray; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 84dfc52..e2a7f92 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-certificate-report") +@RequestMapping("/business/certificateReport") public class BusinessCertificateReportController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java deleted file mode 100644 index c4b51cf..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-enviroment-record") -public class BusinessEnviromentRecordController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java new file mode 100644 index 0000000..1991b83 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java @@ -0,0 +1,18 @@ +package com.casic.missiles.controller.business; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@RestController +@RequestMapping("/business/environmentRecord") +public class BusinessEnvironmentRecordController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index cf82167..4724028 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-interchange") +@RequestMapping("/business/interchange") public class BusinessInterchangeController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index f2efb61..b677d78 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-info") +@RequestMapping("/business/labExecutive") public class BusinessLabExecutiveInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java index c8e2b02..78f5770 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-lab-executive-template-info") +@RequestMapping("/business/labExecutiveTemplate") public class BusinessLabExecutiveTemplateInfoController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 54b4360..2451100 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-order") +@RequestMapping("/business/order") public class BusinessOrderController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java deleted file mode 100644 index c5091bb..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 委托书-样品库关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-order-sample-relation") -public class BusinessOrderSampleRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index 52d26ec..e943ec4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -12,7 +12,7 @@ * @since 2023-02-02 */ @RestController -@RequestMapping("/business-original-record") +@RequestMapping("/business/originalRecord") public class BusinessOriginalRecordController { } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java deleted file mode 100644 index 5314cc7..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-标准装置关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-equipment-relation") -public class BusinessOriginalRecordEquipmentRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java deleted file mode 100644 index c9502d5..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.controller.business; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务管理-原始记录-计量文件关联表 前端控制器 - *

- * - * @author wangpeng - * @since 2023-02-02 - */ -@RestController -@RequestMapping("/business-original-record-file-relation") -public class BusinessOriginalRecordFileRelationController { - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index 3129b39..42f20b0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -87,7 +87,7 @@ /** * 设备检修保养验收单删除 */ - @ApiOperation("设设备检修保养验收单审批操作-删除") + @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { @@ -95,9 +95,9 @@ } /** - * 设设备检修保养验收单编辑 + * 设备检修保养验收单编辑 */ - @ApiOperation("设设备检修保养验收单编辑") + @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { @@ -105,9 +105,9 @@ } /** - * 设设备检修保养验收单导出 + * 设备检修保养验收单导出 */ - @ApiOperation("设设备检修保养验收单导出") + @ApiOperation("设备检修保养验收单导出") @PostMapping("/exportList") @ResponseBody public void exportList(@RequestBody AcceptanceCheckRequest request, HttpServletResponse response) throws Exception{ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 3313687..4a35f01 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -5,6 +5,8 @@ + + @@ -19,7 +21,7 @@ - id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time + id, template_code, sample_type_id, sample_id, measure_dept_id, measure_person_id, measure_item, execute_sequence, remark, is_del, create_user, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java index 66ed59e..576ee08 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -25,7 +25,19 @@ private Long id; /** - * 样品id + * 模板编码(同一实验室列表的多个记录模板编码相同) + */ + @TableField("template_code") + private String templateCode; + + /** + * 模板所属分类id(备用,用于按分类推荐实验室列表) + */ + @TableField("template_type_id") + private Long sampleTypeId; + + /** + * 样品id(备用) */ @TableField("sample_id") private Long sampleId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 1b674ba..bef098c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -9,9 +9,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.AcceptanceCheck; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.dto.equipment.AcceptanceCheckRequest; -import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; +import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.EquipmentApplyTypeEnum; import com.casic.missiles.enums.ExportEnum; @@ -22,14 +21,12 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; -import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.service.equipment.IEquipmentApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentApplyFileService; -import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import javassist.expr.NewArray; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java index f38edca..8763c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java @@ -122,6 +122,7 @@ } @Override + @Transactional public ReturnDTO reject(ApprovalRejectRequest request) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> {