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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java new file mode 100644 index 0000000..c8f0b89 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordFileRelationService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java new file mode 100644 index 0000000..c8f0b89 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordFileRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java new file mode 100644 index 0000000..84e358c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordService extends IService { + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java new file mode 100644 index 0000000..c8f0b89 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordFileRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java new file mode 100644 index 0000000..84e358c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java new file mode 100644 index 0000000..524a15a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.model.customer.CustomerAdviceInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerAdviceService { + + + Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception; + + CustomerAdviceInfo adviceDetail(Long id); + + ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo); + + ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo); + + void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response); + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java new file mode 100644 index 0000000..c8f0b89 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordFileRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java new file mode 100644 index 0000000..84e358c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java new file mode 100644 index 0000000..524a15a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.model.customer.CustomerAdviceInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerAdviceService { + + + Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception; + + CustomerAdviceInfo adviceDetail(Long id); + + ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo); + + ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo); + + void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response); + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java new file mode 100644 index 0000000..461d76d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.model.customer.CustomerSampleInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerSampleService { + + Page listPage(Page page, CustomerSampleListRequest request) throws Exception; + + ReturnDTO addSample(CustomerSampleInfo customerSampleInfo); + + ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo); + + CustomerSampleInfo sampleDetail(Long id); + + void sampleExport(CustomerSampleListRequest request, HttpServletResponse response); + + ReturnDTO deleteSample(Long id); + + Page mesureRecordsBySampleId(Long id); + + Page certificationBySampleId(Long id); + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java new file mode 100644 index 0000000..c8f0b89 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordFileRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java new file mode 100644 index 0000000..84e358c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java new file mode 100644 index 0000000..524a15a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.model.customer.CustomerAdviceInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerAdviceService { + + + Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception; + + CustomerAdviceInfo adviceDetail(Long id); + + ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo); + + ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo); + + void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response); + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java new file mode 100644 index 0000000..461d76d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.model.customer.CustomerSampleInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerSampleService { + + Page listPage(Page page, CustomerSampleListRequest request) throws Exception; + + ReturnDTO addSample(CustomerSampleInfo customerSampleInfo); + + ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo); + + CustomerSampleInfo sampleDetail(Long id); + + void sampleExport(CustomerSampleListRequest request, HttpServletResponse response); + + ReturnDTO deleteSample(Long id); + + Page mesureRecordsBySampleId(Long id); + + Page certificationBySampleId(Long id); + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java new file mode 100644 index 0000000..4b0b2a6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java @@ -0,0 +1,32 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.model.customer.CustomerInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerService { + + Page listPage(Page page, CustomerListRequest request) throws Exception; + + ReturnDTO addCustomer(CustomerInfo customerInfo); + + ReturnDTO updateCustomer(CustomerInfo customerInfo); + + ReturnDTO customerDetail(Long id); + + Page sampleRecordsByCustomerId(Long customerId); + + Page contractRecordsByCustomerId(Long customerId); + + Page mesureRecordsByCustomerId(Long customerId); + + Page certificationByCustomerId(Long customerId); + + void customerExport(CustomerListRequest request, HttpServletResponse response); + +} 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 new file mode 100644 index 0000000..84dfc52 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.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-certificate-report") +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 new file mode 100644 index 0000000..c4b51cf --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnviromentRecordController.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-enviroment-record") +public class BusinessEnviromentRecordController { + +} 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 new file mode 100644 index 0000000..cf82167 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.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-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 new file mode 100644 index 0000000..f2efb61 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.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-lab-executive-info") +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 new file mode 100644 index 0000000..c8e2b02 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveTemplateInfoController.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-lab-executive-template-info") +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 new file mode 100644 index 0000000..54b4360 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.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-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 new file mode 100644 index 0000000..c5091bb --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderSampleRelationController.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-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 new file mode 100644 index 0000000..52d26ec --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.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-original-record") +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 new file mode 100644 index 0000000..5314cc7 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordEquipmentRelationController.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-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 new file mode 100644 index 0000000..c9502d5 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordFileRelationController.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-original-record-file-relation") +public class BusinessOriginalRecordFileRelationController { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java new file mode 100644 index 0000000..8a02be1 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -0,0 +1,82 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerAdviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户投诉模块") +@RestController +@RequestMapping("/customer/advice") +@AllArgsConstructor +public class CustomerAdviceController extends ExportController { + + private final CustomerAdviceService customerAdviceService; + + @ApiOperation("客户投诉查询") + @RequestMapping("/listPage") + public ReturnDTO> adviceListPage(@RequestBody @Valid CustomerAdviceListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerAdviceService.adviceListPage(page, request))); + } + + @ApiOperation("客户投诉详情") + @RequestMapping("/detail") + public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerAdviceService.adviceDetail(idDTO.getId())); + } + + @ApiOperation("客户投诉更新") + @RequestMapping("/update") + public ReturnDTO updateAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult){ + Assert.isFalse(Objects.isNull(customerAdviceInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + } + + @ApiOperation("客户投诉新增") + @RequestMapping("/add") + public ReturnDTO addAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + } + + //*******************************************************************************************************************// + @ApiOperation("客户投诉导出") + @RequestMapping("/export") + public void exportAdvice(@RequestBody @Valid CustomerAdviceListRequest request, HttpServletResponse response) { + customerAdviceService.adviceExport(request, response); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java new file mode 100644 index 0000000..4e02809 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -0,0 +1,130 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户基础信息模块") +@RestController +@RequestMapping("/customer") +@AllArgsConstructor +public class CustomerController extends ExportController { + + private final CustomerService customerService; + + @ApiOperation("客户基本信息列表") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerService.listPage(page, request))); + } + + @ApiOperation("客户新增") + @RequestMapping("/add") + public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.addCustomer(customerInfo)); + } + + @ApiOperation("客户更新") + @RequestMapping("/update") + public ReturnDTO updateCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + } + + @ApiOperation("客户详情") + @RequestMapping("/detail") + public ReturnDTO customerDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return customerService.customerDetail(idDTO.getId()); + } + + @ApiOperation("根据客户id查询样品记录-分页") + @RequestMapping("/sampleRecords") + public ReturnDTO> sampleRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询合同记录-分页") + @RequestMapping("/contractRecords") + public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定记录-分页") + @RequestMapping("/mesureRecords") + public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); + } + + @ApiOperation("根据客户id查询检定证书-分页") + @RequestMapping("/certificateRecords") + public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); + } + + @ApiOperation("客户导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){ + customerService.customerExport(request, response); + } + + //*******************************************************************************************************************// +// @ApiOperation("客户批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java new file mode 100644 index 0000000..0d7320f --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -0,0 +1,123 @@ +package com.casic.missiles.controller.customer; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.customer.CustomerSampleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Objects; + +@Api(tags = "客户样本信息模块") +@RestController +@RequestMapping("/customer/sample") +@AllArgsConstructor +public class CustomerSampleController extends ExportController { + + private final CustomerSampleService customerSampleService; + + @ApiOperation("样品列表查询-分页") + @RequestMapping("/listPage") + public ReturnDTO> listPage(@RequestBody @Valid CustomerSampleListRequest request, BindingResult bindingResult) throws Exception { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(customerSampleService.listPage(page, request))); + } + + @ApiOperation("样品新增") + @RequestMapping("/add") + public ReturnDTO addSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + } + + @ApiOperation("样品编辑") + @RequestMapping("/update") + public ReturnDTO updateSample(@RequestBody @Valid CustomerSampleInfo customerSampleInfo, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(customerSampleInfo.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + } + + @ApiOperation("样品详情") + @RequestMapping("/detail") + public ReturnDTO sampleDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.sampleDetail(idDTO.getId())); + } + + @ApiOperation("列表数据删除") + @RequestMapping("/delete") + public ReturnDTO deleteSample(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + } + + @ApiOperation("样品导出") + @RequestMapping("/export") + public void sampleExport(@RequestBody @Valid CustomerSampleListRequest request, HttpServletResponse response) { + customerSampleService.sampleExport(request, response); + } + + @ApiOperation("根据样品id查询检定记录") + @RequestMapping("/mesureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.mesureRecordsBySampleId(idDTO.getId()))); + } + + @ApiOperation("根据样品id查询检定证书") + @RequestMapping("/certificationBySampleId") + public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); + } + +// @ApiOperation("样品批量导入") +// @RequestMapping("/batchImport") +// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { +// Assert.isFalse(bindingResult.hasErrors(), () -> { +// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); +// }); +// return null; +// } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java new file mode 100644 index 0000000..a42dc64 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.controller.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@Api(tags = "客户工作台资源") +@RestController +@RequestMapping("/customer/workbench") +@AllArgsConstructor +public class CustomerWorkbenchController { + + private final CustomerWorkbenchService customerWorkbenchService; + + @ApiOperation("样品新增趋势") + @RequestMapping("/sample/increaseTrend") + public ReturnDTO>> increaseTrend() { + return customerWorkbenchService.sampleIncreaseTrend(); + } + + @ApiOperation("样品到期趋势") + @RequestMapping("/sample/expireTrend") + public ReturnDTO>> querySampleExpireTrend() { + return customerWorkbenchService.querySampleExpireTrend(); + } + + @ApiOperation("客户新增趋势") + @RequestMapping("/increaseTrend") + public ReturnDTO>> customerIncreaseTrend() { + return customerWorkbenchService.customerIncreaseTrend(); + } + + @ApiOperation("优质客户名单") + @RequestMapping("/excellentList") + public ReturnDTO>> customerExcellentList() { + return customerWorkbenchService.customerExcellentList(); + } +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index ab864e3..ee55d31 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -118,6 +118,6 @@ code: generate: #作者 - author: cuicheng + author: wangpeng #待生成对象表名 - table-name: system_flow_deploy_form + table-name: business_order_sample_relation diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index b7bd107..b139d8a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -27,7 +27,10 @@ METER_STAFF("meterStaff", "meterStaff", "计量人员"), STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"), - METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"); + METER_ACCEPTANCE_CHECK("acceptanceCheck", "acceptanceCheck", "设备检修保养验收单"), + CUSTOMER_EXPORT("customerData", "customerData", "客户信息"), + SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"), + ADVICE_EXPORT("adviceData", "adviceData", "客户反馈"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java new file mode 100644 index 0000000..17206ce --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessCertificateReportMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java new file mode 100644 index 0000000..5d3bc2f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessEnviromentRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java new file mode 100644 index 0000000..46d3a54 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessInterchangeMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java new file mode 100644 index 0000000..5c07c1e --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java new file mode 100644 index 0000000..43d4cae --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessLabExecutiveTemplateInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java new file mode 100644 index 0000000..7182641 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java new file mode 100644 index 0000000..acba033 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOrderSampleRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java new file mode 100644 index 0000000..7c248e5 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordEquipmentRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java new file mode 100644 index 0000000..7bfcfd0 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordFileRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordFileRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java new file mode 100644 index 0000000..752e2e8 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface BusinessOriginalRecordMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java new file mode 100644 index 0000000..460f54c --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerAdviceMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface CustomerAdviceMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(advice_no, 12)), 0) from customer_advice_info ") + Long selectMaxAdviceNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java new file mode 100644 index 0000000..5c3f737 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(customer_no, 12)), 0) from customer_info ") + Long selectMaxCustomerNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java new file mode 100644 index 0000000..76055e1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerSampleMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(sample_no, 12)), 0) from customer_sample_info ") + Long selectMaxSampleNo(); + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java new file mode 100644 index 0000000..211f96f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerUserMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.mapper.customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.customer.CustomerUserInfo; +import org.apache.ibatis.annotations.Select; + +public interface CustomerUserMapper extends BaseMapper { + + @Select("SELECT IFNULL(max(RIGHT(user_no, 12)), 0) from customer_user_info ") + Long selectMaxUserNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java new file mode 100644 index 0000000..6eb56d1 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerWorkbenchMapper.java @@ -0,0 +1,18 @@ +package com.casic.missiles.mapper.customer; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface CustomerWorkbenchMapper { + + List> sampleIncreaseTrend(); + + List> querySampleExpireTrend(); + + List> customerIncreaseTrend(); + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java new file mode 100644 index 0000000..ed42059 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.CertificationResponse; + +public interface CertificationResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java new file mode 100644 index 0000000..cc86fcd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/ContractRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.ContractRecordsResponse; + +public interface ContractRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java new file mode 100644 index 0000000..f51758f --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerSampleListResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; + +public interface CustomerSampleListResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java new file mode 100644 index 0000000..a086b38 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.MesureRecordsResponse; + +public interface MesureRecordsResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java new file mode 100644 index 0000000..3fa367b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/SampleRecordsResponseMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.mapper.customer.customize; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; + +public interface SampleRecordsResponseMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml new file mode 100644 index 0000000..6a3e851 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml new file mode 100644 index 0000000..4fb3b95 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml new file mode 100644 index 0000000..4d64b57 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml new file mode 100644 index 0000000..326d8f0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, sample_id, measure_dept_id, measure_person_id, measure_item, measure_sequence, execute_sequence, measure_status, is_auto, require_certifications, operate_time, start_time, end_time, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml new file mode 100644 index 0000000..3313687 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + 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-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml new file mode 100644 index 0000000..b11e93d --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml new file mode 100644 index 0000000..75d375e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + id, order_id, sample_id, sample_status + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml new file mode 100644 index 0000000..eefa66a --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, standard_equipment_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml new file mode 100644 index 0000000..cb338d4 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordFileRelationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + id, original_record_id, file_id + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml new file mode 100644 index 0000000..cccc6a0 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, original_record_code, original_record_name, calibration_category, calibration_time, environment_id, calibration_place, order_id, sample_id, template_id, original_record_file, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml new file mode 100644 index 0000000..0f59d8e --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index ab1f7fa..2fd8ee8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -80,4 +80,17 @@ String CHECK_RESULT = "checkResult"; //检查结果 String ACCEPTANCE_CHECK_RESULT = "acceptanceCheckResult"; + + //规模类型 + String COMPANY_SCALE = "companySize"; + //规模类型 + String BUSINESS_SCALE = "businessSize"; + //整体评价 + String EVALUATION = "evaluation"; + //投诉类型 + String ADVICE_TYPE = "adviceType"; + //样品所属 + String SAMPLE_BELONG="sampleBelong"; + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java new file mode 100644 index 0000000..b93049e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.dto.customer.advice; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel +@Data +public class CustomerAdviceListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "投诉编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") + private String endTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java new file mode 100644 index 0000000..69a1b4e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("meter_certificate") +public class CertificationResponse { + + @TableField("id") + @ApiModelProperty(value = "证书id", dataType = "Long") + private Long certificationId; + + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificationCode; + + @ApiModelProperty(value = "证书名称", dataType = "String") + private String certificationName; + + @ApiModelProperty(value = "证书类型", dataType = "String") + private String certificationType; + + @ApiModelProperty(value = "证书类型名称", dataType = "String") + private String certificationTypeName; + + @ApiModelProperty(value = "证书出具日期", dataType = "String") + private String effectiveDate; + + @ApiModelProperty(value = "证书有效期", dataType = "String") + private String expirationDate; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java new file mode 100644 index 0000000..055ac15 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/ContractRecordsResponse.java @@ -0,0 +1,41 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +//@TableName("") +public class ContractRecordsResponse { + + @ApiModelProperty(value = "合同id", dataType = "Long") + private Long contractId; + + @ApiModelProperty(value = "合同编号", dataType = "String") + private String contractCode; + + @ApiModelProperty(value = "合同名称", dataType = "String") + private String contractName; + + @ApiModelProperty(value = "合同金额", dataType = "String") + private String contractPrice; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatus; + + @ApiModelProperty(value = "合同状态", dataType = "String") + private String contractStatusName; + + @ApiModelProperty(value = "合同时间", dataType = "String") + private String contractTime; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String aCompanyDutyman; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java new file mode 100644 index 0000000..b7897cf --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -0,0 +1,27 @@ +package com.casic.missiles.dto.customer.Info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class CustomerListRequest { + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "业务规模", dataType = "String") + private String bussinessSize; + + @ApiModelProperty(value = "公司评级", dataType = "String") + private String grade; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java new file mode 100644 index 0000000..6e3bc2d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/SampleRecordsResponse.java @@ -0,0 +1,40 @@ +package com.casic.missiles.dto.customer.Info; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +@TableName("customer_sample_info") +public class SampleRecordsResponse { + + @TableField("id") + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long sampleId; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + +// @ApiModelProperty(value = "上次检定日期", dataType = "String") +// private String mesureTime; + + @ApiModelProperty(value = "检定周期", dataType = "String") + private String mesurePeriod; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java new file mode 100644 index 0000000..f13b5d4 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MesureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java new file mode 100644 index 0000000..59ae1ca --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class CustomerSampleListRequest { + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelong; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "检定开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "检定结束时间", dataType = "String") + private String endTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java new file mode 100644 index 0000000..45c3fc0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -0,0 +1,63 @@ +package com.casic.missiles.dto.customer.sample; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +@TableName("customer_sample_info") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class CustomerSampleListResponse { + + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + @ExcelProperty(value = "样品编号",order = 0) + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + @ExcelProperty(value = "样品名称",order = 1) + private String sampleName; + + @ApiModelProperty(value = "型号", dataType = "String") + @ExcelProperty(value = "样品型号",order = 2) + private String sampleModel; + + @ApiModelProperty(value = "出厂编号", dataType = "String") + @ExcelProperty(value = "出厂编号",order = 3) + private String manufacturingNo; + + @ApiModelProperty(value = "委托方代码", dataType = "String") + @ExcelProperty(value = "委托方代码",order = 4) + private String customerId; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + @ExcelProperty(value = "委托方名称",order = 5) + private String customerName; + + @ApiModelProperty(value = "检定周期", dataType = "String") + @ExcelProperty(value = "检定周期",order = 6) + private String mesurePeriod; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + @ExcelProperty(value = "上次检定时间",order = 7) + private String mesureLastTime; + + @ApiModelProperty(value = "备注", dataType = "String") + @ExcelProperty(value = "备注",order = 8) + private String remark; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 3e418c6..1ef30be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -11,4 +11,5 @@ public class ToBeApprovedDTO { private String businessKey; private String taskId; + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java index c488f9f..7b21122 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java @@ -111,4 +111,9 @@ @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String") private String taskId; + /** + * 可选决策项 + */ + @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer") + private Integer decisionItem; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java new file mode 100644 index 0000000..49d6800 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -0,0 +1,108 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-证书报告 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_certificate_report") +public class BusinessCertificateReport implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 证书报告编号 + */ + @TableField("certificate_report_code") + private String certificateReportCode; + + /** + * 证书报告名称 + */ + @TableField("certificate_report_name") + private String certificateReportName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certificate_report_category") + private String certificateReportCategory; + + /** + * 检校专业（字典code） + */ + @TableField("calibration_major") + private String calibrationMajor; + + /** + * 出具日期 + */ + @TableField("issuance_date") + private String issuanceDate; + + /** + * 证书有效期 + */ + @TableField("expiration_date") + private String expirationDate; + + /** + * 证书报告模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 电子签章id（签章表id） + */ + @TableField("sign_id") + private Long signId; + + /** + * 认可标志专用章id（签章表id） + */ + @TableField("approval_sign_id") + private Long approvalSignId; + + /** + * 证书报告附件（minio存储文件名） + */ + @TableField("certificate_report_file") + private String certificateReportFile; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java new file mode 100644 index 0000000..d2a85fe --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_enviroment_record") +public class BusinessEnviromentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 环境记录单编号 + */ + @TableField("environment_code") + private String environmentCode; + + /** + * 房间编号 + */ + @TableField("room_number") + private String roomNumber; + + /** + * 默认登录账号用户名 + */ + @TableField("recorder") + private String recorder; + + /** + * 记录时间 + */ + @TableField("record_time") + private String recordTime; + + /** + * 温度 + */ + @TableField("temperature") + private String temperature; + + /** + * 湿度 + */ + @TableField("humidity") + private String humidity; + + /** + * 输出电压 + */ + @TableField("output_voltage") + private String outputVoltage; + + /** + * 零地电压 + */ + @TableField("zero_ground_voltage") + private String zeroGroundVoltage; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java new file mode 100644 index 0000000..f62ce7f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -0,0 +1,154 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-设备交接单 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_interchange") +public class BusinessInterchange implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 交接单编号 + */ + @TableField("interchange_code") + private String interchangeCode; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 证书单位名称 + */ + @TableField("certification_company") + private String certificationCompany; + + /** + * 证书单位传真 + */ + @TableField("certification_company_fex") + private String certificationCompanyFex; + + /** + * 证书单位邮编 + */ + @TableField("certification_company_email") + private String certificationCompanyEmail; + + /** + * 接收人 + */ + @TableField("reciever") + private String reciever; + + /** + * 接收人电话/手机 + */ + @TableField("reciever_phone") + private String recieverPhone; + + /** + * 证书单位地址 + */ + @TableField("certification_company_address") + private String certificationCompanyAddress; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 完成时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 交接时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 检校类别（字典code） + */ + @TableField("mesure_category") + private String mesureCategory; + + /** + * 保密要求（字典code） + */ + @TableField("secrecy") + private String secrecy; + + /** + * 样品外观说明（手填） + */ + @TableField("appearance") + private String appearance; + + /** + * 依据文件说明（手填） + */ + @TableField("rely_file") + private String relyFile; + + /** + * 送检人签名文件，minio存储文件名（为空时打印签字） + */ + @TableField("deliverer_sign_file") + private String delivererSignFile; + + /** + * 送检人签字时间 + */ + @TableField("deliverer_sign_time") + private String delivererSignTime; + + /** + * 接收人签名文件，minio存储文件名（系统签名模块获取） + */ + @TableField("reciever_sign_file") + private String recieverSignFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java new file mode 100644 index 0000000..296c6b2 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_info") +public class BusinessLabExecutiveInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托单id（可用于区分哪次检测） + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 检测顺序，执行流程前收发员调整的顺序 + */ + @TableField("measure_sequence") + private Integer measureSequence; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 检测状态（备用，维护在flowable） + */ + @TableField("measure_status") + private String measureStatus; + + /** + * 是否自动检定（使用自动检定软件/手动检定） + */ + @TableField("is_auto") + private Boolean isAuto; + + /** + * 应出具证书总数 + */ + @TableField("require_certifications") + private Integer requireCertifications; + + /** + * 操作时间（分配、检测、拒绝、退回等操作） + */ + @TableField("operate_time") + private String operateTime; + + /** + * 检定开始时间 + */ + @TableField("start_time") + private String startTime; + + /** + * 检定结束时间 + */ + @TableField("end_time") + private String endTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} 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 new file mode 100644 index 0000000..66ed59e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveTemplateInfo.java @@ -0,0 +1,76 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_lab_executive_template_info") +public class BusinessLabExecutiveTemplateInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 检定部门id（可用于获取部门负责人） + */ + @TableField("measure_dept_id") + private Long measureDeptId; + + /** + * 检定人id + */ + @TableField("measure_person_id") + private Long measurePersonId; + + /** + * 检定项目(备用) + */ + @TableField("measure_item") + private String measureItem; + + /** + * 执行顺序，实际流程执行的实验室检测顺序 + */ + @TableField("execute_sequence") + private Integer executeSequence; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java new file mode 100644 index 0000000..2c8f0b5 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -0,0 +1,124 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-委托书 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order") +public class BusinessOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书编号 + */ + @TableField("order_code") + private String orderCode; + + /** + * 委托日期 + */ + @TableField("order_time") + private String orderTime; + + /** + * 送样人/送检人门户网站登录id（门户网站新建委托书时必传） + */ + @TableField("deliverer_id") + private Long delivererId; + + /** + * 送样人/送检人 + */ + @TableField("deliverer") + private String deliverer; + + /** + * 送样人联系方式 + */ + @TableField("deliverer_tel") + private String delivererTel; + + /** + * 送检时间 + */ + @TableField("deliver_time") + private String deliverTime; + + /** + * 预约送达时间 + */ + @TableField("plan_deliver_time") + private String planDeliverTime; + + /** + * 要求检完时间 + */ + @TableField("require_over_time") + private String requireOverTime; + + /** + * 委托方id（客户id） + */ + @TableField("customer_id") + private Long customerId; + + /** + * 状态（字典code） + */ + @TableField("status") + private String status; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + /** + * 附件，minio存储文件名 + */ + @TableField("minio_file_name") + private String minioFileName; + + /** + * 证书类别，多个逗号分割（字典code） + */ + @TableField("certifications") + private String certifications; + + /** + * 是否加急 + */ + @TableField("is_urgent") + private Boolean isUrgent; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java new file mode 100644 index 0000000..9e224b3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -0,0 +1,46 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 委托书-样品库关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_order_sample_relation") +public class BusinessOrderSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品库样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 样品在本次委托中分发的状态（字典code） + */ + @TableField("sample_status") + private String sampleStatus; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java new file mode 100644 index 0000000..18e50a8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -0,0 +1,106 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record") +public class BusinessOriginalRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录编号 + */ + @TableField("original_record_code") + private String originalRecordCode; + + /** + * 原始记录名称 + */ + @TableField("original_record_name") + private String originalRecordName; + + /** + * 检校类别（字典code） + */ + @TableField("calibration_category") + private String calibrationCategory; + + /** + * 检校时间 + */ + @TableField("calibration_time") + private String calibrationTime; + + /** + * 环境记录单id + */ + @TableField("environment_id") + private Long environmentId; + + /** + * 检校地点 + */ + @TableField("calibration_place") + private String calibrationPlace; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 原始记录模板id + */ + @TableField("template_id") + private Long templateId; + + /** + * 原始记录附件（minio存储文件名） + */ + @TableField("original_record_file") + private String originalRecordFile; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + @TableField("is_del") + private Boolean isDel; + + @TableField("create_user") + private Long createUser; + + @TableField("create_time") + private String createTime; + + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java new file mode 100644 index 0000000..2368a98 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordEquipmentRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_equipment_relation") +public class BusinessOriginalRecordEquipmentRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 标准装置id + */ + @TableField("standard_equipment_id") + private Long standardEquipmentId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java new file mode 100644 index 0000000..e46153d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordFileRelation.java @@ -0,0 +1,40 @@ +package com.casic.missiles.model.business; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Data +@TableName("business_original_record_file_relation") +public class BusinessOriginalRecordFileRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 原始记录id + */ + @TableField("original_record_id") + private Long originalRecordId; + + /** + * 计量文件id + */ + @TableField("file_id") + private Long fileId; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java new file mode 100644 index 0000000..81dc9da --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java @@ -0,0 +1,74 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_advice_info") +public class CustomerAdviceInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @ApiModelProperty(value = "编号", dataType = "String") + private String adviceNo; + + @ApiModelProperty(value = "投诉类型-字典", dataType = "String") + private String adviceClass; + + @ApiModelProperty(value = "投诉类型", dataType = "String") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String adviceType; + + @TableField(exist = false) + @ApiModelProperty(value = "投诉类型名称", dataType = "String") + private String adviceTypeName; + + @ApiModelProperty(value = "投诉人", dataType = "String") + private String advicePerson; + + @ApiModelProperty(value = "投诉人联系方式", dataType = "String") + private String personPhone; + + @ApiModelProperty(value = "客户编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "客户id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "投诉内容", dataType = "String") + private String content; + + @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String") + private String handleStatus; //投诉人联系方式 + + @ApiModelProperty(value = "处置意见", dataType = "String") + private String handleMessage; //投诉人联系方式 + + @ApiModelProperty(value = "创建用户id", dataType = "String") + private Long createUser; //投诉人联系方式 + + @ApiModelProperty(value = "编辑用户id", dataType = "String") + private Long updateUser; //投诉人联系方式 + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; //投诉人联系方式 + + @ApiModelProperty(value = "投诉时间", dataType = "String") + private String adviceTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; //投诉人联系方式 + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String updateTime; //投诉人联系方式 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java new file mode 100644 index 0000000..94ac9e3 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java @@ -0,0 +1,173 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@TableName("customer_info ") +public class CustomerInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "公司名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "公司简称", dataType = "String") + private String briefName; + + @ApiModelProperty(value = "业务内容", dataType = "String") + private String businessContent; + + @ApiModelProperty(value = "税号", dataType = "String") + private String taxNumber; + + @ApiModelProperty(value = "银行账户名", dataType = "String") + private String bankAccount; + + @ApiModelProperty(value = "银行名称", dataType = "String") + private String bankName; + + @ApiModelProperty(value = "银行账号", dataType = "String") + private String bankAccountNumber; + + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + + @ApiModelProperty(value = "负责人", dataType = "String") + private String director; + + @ApiModelProperty(value = "电话", dataType = "String") + private String phone; + + @ApiModelProperty(value = "传真", dataType = "String") + private String fax; + + @ApiModelProperty(value = "手机", dataType = "String") + private String mobile; + + @ApiModelProperty(value = "邮箱", dataType = "String") + private String email; + + @ApiModelProperty(value = "网址", dataType = "String") + private String website; + + @ApiModelProperty(value = "履约评级-字典", dataType = "String") + private String grade; + + @ApiModelProperty(value = "公司规模", dataType = "String") + @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE) + private String companySize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模", dataType = "String") + private String companySizeName; + + @ApiModelProperty(value = "业务规模-字典", dataType = "String") + @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE) + private String businessSize; + + @TableField(exist = false) + @ApiModelProperty(value = "公司规模名称", dataType = "String") + private String businessSizeName; + + @ApiModelProperty(value = "整体评价", dataType = "String") + @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION) + private String evaluation; + + @TableField(exist = false) + @ApiModelProperty(value = "整体评价", dataType = "String") + private String evaluationName; + + @ApiModelProperty(value = "公司地址-国家", dataType = "String") + private String addressCountry; + + @ApiModelProperty(value = "公司地址-省", dataType = "String") + private String addressProvince; + + @ApiModelProperty(value = "公司地址-市", dataType = "String") + private String addressCity; + + @ApiModelProperty(value = "公司地址-区", dataType = "String") + private String addressArea; + + @ApiModelProperty(value = "公司地址-详细地址", dataType = "String") + private String fullAddress; + + @ApiModelProperty(value = "公司地址-国家名字", dataType = "String") + private String addressCountryName; + + @ApiModelProperty(value = "公司地址-省名字", dataType = "String") + private String addressProvinceName; + + @ApiModelProperty(value = "公司地址-市名字", dataType = "String") + private String addressCityName; + + @ApiModelProperty(value = "公司地址-区名字", dataType = "String") + private String addressAreaName; + + @ApiModelProperty(value = "开票地址-国家", dataType = "String") + private String invoiceCountry; + + @ApiModelProperty(value = "开票地址-省", dataType = "String") + private String invoiceProvince; + + @ApiModelProperty(value = "开票地址-市", dataType = "String") + private String invoiceCity; + + @ApiModelProperty(value = "开票地址-区", dataType = "String") + private String invoiceArea; + + @ApiModelProperty(value = "开票地址-详细地址", dataType = "String") + private String invoiceFullAddress; + + @ApiModelProperty(value = "开票地址-国家名字", dataType = "String") + private String invoiceCountryName; + + @ApiModelProperty(value = "开票地址-省名字", dataType = "String") + private String invoiceProvinceName; + + @ApiModelProperty(value = "开票地址-市名字", dataType = "String") + private String invoiceCityName; + + @ApiModelProperty(value = "开票地址-区名字", dataType = "String") + private String invoiceAreaName; + + @ApiModelProperty(value = "业务范围", dataType = "String") + private String businessScope; + + @ApiModelProperty(value = "minio存储文件名", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "创建人", dataType = "Long") + private Long createUser; + + @ApiModelProperty(value = "最后编辑人", dataType = "Long") + private Long updateUser; + + @ApiModelProperty(value = "删除标记", dataType = "Integer") + private Integer isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后更新时间", dataType = "String") + private String updateTime; + + @TableField(exist = false) + private List customerUserList; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java new file mode 100644 index 0000000..c12ec97 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_sample_info") +public class CustomerSampleInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + + @ApiModelProperty(value = "委托方id", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品所属", dataType = "String") + @DictCodeField(message = "样品所属描述不合法", cacheName = MeterDictCode.SAMPLE_BELONG) + private String sampleBelong; + + @TableField(exist = false) + @ApiModelProperty(value = "样品所属", dataType = "String") + private String sampleBelongName; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + + @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + private String manufacturingNo; + + @ApiModelProperty(value = "生产厂家", dataType = "String") + private String manufacturer; + + @ApiModelProperty(value = "厂家国别", dataType = "String") + private String manufacturerCountry; + + @ApiModelProperty(value = "出厂年月", dataType = "String") + private String manufacturingDate; + + @ApiModelProperty(value = "ABC", dataType = "String") + private String abc; + + @ApiModelProperty(value = " 电源电压", dataType = "String") + private String powerVoltage; + + @ApiModelProperty(value = " 附件及数量", dataType = "String") + private String appendix; + + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = " 检校类别-字典", dataType = "String") + private String mesureCategory; + + @ApiModelProperty(value = "检定项目", dataType = "String") + private String mesureContent; + + @ApiModelProperty(value = "检定周期(月)", dataType = "String") + private String mesurePeriod; + + @ApiModelProperty(value = "检定方式-字典", dataType = "String") + private String mesureType; + + @ApiModelProperty(value = "样品状态-待输入、已收入、检测中、待归还、已归还", dataType = "String") + private String sampleStatus; + +// @ApiModelProperty(value = "样品证书状况 0未超期，1即将超期，2已超期", dataType = "String") +// private String certificationStatus; + + @ApiModelProperty(value = "备注", dataType = "String") + private String remark; + + @ApiModelProperty(value = "说明书", dataType = "String") + private String minioFileName; + + @ApiModelProperty(value = "标签绑定", dataType = "String") + private String labelBind; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private Integer isDel; + + @ApiModelProperty(value = "创建人", dataType = "String") + private Long createUser; + + @ApiModelProperty(value = "更新人", dataType = "String") + private Long updateUser; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "更新时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java new file mode 100644 index 0000000..211e8d8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -0,0 +1,44 @@ +package com.casic.missiles.model.customer; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("customer_user_info ") +public class CustomerUserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + @ApiModelProperty(value = "客户表id", dataType = "String") + private Long customerId; + + @ApiModelProperty(value = "人员编号", dataType = "String") + private String userNo; + + @ApiModelProperty(value = "名称", dataType = "String") + private String name; + + @ApiModelProperty(value = "部门", dataType = "String") + private String department; + + @ApiModelProperty(value = "职务", dataType = "String") + private String job; + + @ApiModelProperty(value = "联系方式", dataType = "String") + private String phone; + + @ApiModelProperty(value = "删除标记", dataType = "String") + private String isDel; + + @ApiModelProperty(value = "创建时间", dataType = "String") + private String createTime; + + @ApiModelProperty(value = "最后修改时间", dataType = "String") + private String updateTime; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 6fb5fdf..447f9a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -349,6 +350,10 @@ log.error("查询待审批的任务，该表单不存在对应的流程定义，formId:{}", formId); return new ArrayList<>(); } + JSONObject jsonObject = JSONObject.parseObject(flowForm.getFlowDef()); + JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef"); + Integer decisionItem = workFlowDef.getInteger("decisionItem"); + AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -369,6 +374,7 @@ ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); + toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTOs.add(toBeApprovedDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java new file mode 100644 index 0000000..ac5918e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.service.business.IBusinessCertificateReportService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-证书报告 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessCertificateReportServiceImpl extends ServiceImpl implements IBusinessCertificateReportService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java new file mode 100644 index 0000000..5e48f7c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper; +import com.casic.missiles.model.business.BusinessEnviromentRecord; +import com.casic.missiles.service.business.IBusinessEnviromentRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java new file mode 100644 index 0000000..94d46e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessInterchangeMapper; +import com.casic.missiles.model.business.BusinessInterchange; +import com.casic.missiles.service.business.IBusinessInterchangeService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-设备交接单 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java new file mode 100644 index 0000000..7742517 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java new file mode 100644 index 0000000..6d988d6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveTemplateInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessLabExecutiveTemplateInfoMapper; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessLabExecutiveTemplateInfoServiceImpl extends ServiceImpl implements IBusinessLabExecutiveTemplateInfoService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java new file mode 100644 index 0000000..4c063db --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderSampleRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; +import com.casic.missiles.service.business.IBusinessOrderSampleRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 委托书-样品库关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderSampleRelationServiceImpl extends ServiceImpl implements IBusinessOrderSampleRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java new file mode 100644 index 0000000..9e42e4d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOrderMapper; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.service.business.IBusinessOrderService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-委托书 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java new file mode 100644 index 0000000..43cfa23 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordEquipmentRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordEquipmentRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordEquipmentRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java new file mode 100644 index 0000000..2d719fa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordFileRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordFileRelationMapper; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; +import com.casic.missiles.service.business.IBusinessOriginalRecordFileRelationService; +import org.springframework.stereotype.Service; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordFileRelationServiceImpl extends ServiceImpl implements IBusinessOriginalRecordFileRelationService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java new file mode 100644 index 0000000..dabc7bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.business; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; +import com.casic.missiles.service.business.IBusinessOriginalRecordService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +@Service +public class BusinessOriginalRecordServiceImpl extends ServiceImpl implements IBusinessOriginalRecordService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java new file mode 100644 index 0000000..184a15e --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -0,0 +1,105 @@ +package com.casic.missiles.service.Impl.customer; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerAdviceMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; +import com.casic.missiles.service.customer.CustomerAdviceService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerAdviceServiceImpl implements CustomerAdviceService { + + private final CustomerAdviceMapper customerAdviceMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception { + QueryWrapper wrapper = listParamWrapper(customerAdviceListRequest); + Page resultPage = customerAdviceMapper.selectPage(page, wrapper); + for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + } + return resultPage; + } + + @Override + public CustomerAdviceInfo adviceDetail(Long id) { + CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id); + return customerAdviceInfo; + } + + @Override + public ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + customerAdviceMapper.updateById(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉更新异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo) { + try { + initCustomerAdviceInfo(customerAdviceInfo); + customerAdviceMapper.insert(customerAdviceInfo); + return ReturnUtil.success(); + } catch (Exception daex) { + log.error("客户投诉新增异常,客户信息{},异常信息{}", JSONObject.toJSON(customerAdviceInfo), daex.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerAdviceList = customerAdviceMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerAdviceListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getAdviceNo()), "advice_no", request.getAdviceNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { + Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); + String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerAdviceInfo.setCreateUser(authUser.getId()); + customerAdviceInfo.setUpdateUser(authUser.getId()); + customerAdviceInfo.setAdviceNo(adviceNo); + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java new file mode 100644 index 0000000..c986d41 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -0,0 +1,141 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; +import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@AllArgsConstructor +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { + + private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + private final IBaseExportService iBaseExportService; + private final CertificationResponseMapper certificationResponseMapper; + private final MesureRecordsResponseMapper mesureResponseMapper; + + @Override + public Page listPage(Page page, CustomerSampleListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); + return customerSamplePage; + } + + @Override + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) { + initSample(customerSampleInfo); + Integer addFlag = this.baseMapper.insert(customerSampleInfo); + if (addFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) { + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setUpdateUser(authUser.getId()); + initSample(customerSampleInfo); + Integer updateFlag = this.baseMapper.updateById(customerSampleInfo); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public CustomerSampleInfo sampleDetail(Long id) { + CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); + return customerSampleInfo; + } + + @Override + public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerSampleListResponse.class, customerSampleList, ExportEnum.SAMPLE_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public ReturnDTO deleteSample(Long id) { + Integer deleteFalg = this.baseMapper.deleteById(id); + if (deleteFalg > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public Page mesureRecordsBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page mesureRecordsResponsePage= mesureResponseMapper.selectPage(page,wrapper); + return mesureRecordsResponsePage; + } + + @Override + public Page certificationBySampleId(Long id) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper=new QueryWrapper() + .eq("sample_id",id); + Page certificationResponsePage= certificationResponseMapper.selectPage(page,wrapper); + return certificationResponsePage; + } + + private void initSample(CustomerSampleInfo customerSampleInfo) { + Long maxNo = this.baseMapper.selectMaxSampleNo(); + String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerSampleInfo.setSampleNo(sampleNo); + customerSampleInfo.setCreateUser(authUser.getId()); + customerSampleInfo.setUpdateUser(authUser.getId()); + } + + private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,mesure_period,mesure_last_time,remark"); + queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 + queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());//样品型号 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());//委托方名称 + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());//委托方代码 + queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); + queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java new file mode 100644 index 0000000..cbf66c8 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -0,0 +1,184 @@ +package com.casic.missiles.service.Impl.customer; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.mapper.customer.CustomerMapper; +import com.casic.missiles.mapper.customer.CustomerUserMapper; +import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; +import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerInfo; +import com.casic.missiles.model.customer.CustomerUserInfo; +import com.casic.missiles.service.customer.CustomerService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + private final SampleRecordsResponseMapper sampleRecordsResponseMapper; + private final CustomerUserMapper customerUserMapper; + private final CertificationResponseMapper certificationMapper; + private final IBaseExportService iBaseExportService; + + @Override + public Page listPage(Page page, CustomerListRequest request) throws Exception { + QueryWrapper wrapper = listParamWrapper(request); + Page resultPage = this.baseMapper.selectPage(page, wrapper); + for (CustomerInfo customerInfo : resultPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(customerInfo); + } + return resultPage; + } + + @Override + @Transactional + public ReturnDTO addCustomer(CustomerInfo customerInfo) { + initCustomerInfo(customerInfo); + try { + this.baseMapper.insert(customerInfo); + userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + @Transactional + public ReturnDTO updateCustomer(CustomerInfo customerInfo) { + try { + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setUpdateUser(authUser.getId()); + this.baseMapper.updateById(customerInfo); + userInfoListEditor(customerInfo.getCustomerUserList()); + return ReturnUtil.success(); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public ReturnDTO customerDetail(Long id) { + try { + CustomerInfo customerInfo = this.baseMapper.selectById(id); + customerInfo.setCustomerUserList(customerUserDetail(id)); + return ReturnUtil.success(customerInfo); + } catch (DataAccessException dae) { + log.error("客户新增,新增异常，异常信息{}", dae.getMessage()); + return ReturnUtil.failed(); + } + } + + @Override + public Page sampleRecordsByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", customerId); + queryWrapper.orderByDesc("create_time"); + Page sampleRecordsResponsePage = sampleRecordsResponseMapper.selectPage(page, queryWrapper); + return sampleRecordsResponsePage; + } + + + @Override//暂定不做 + public Page contractRecordsByCustomerId(Long customerId) { + Page contractRecordsResponsePage = PageFactory.defaultPage(); + + return contractRecordsResponsePage; + } + + @Override//暂定不做 + public Page mesureRecordsByCustomerId(Long customerId) { + Page mesureRecordsResponsePage = PageFactory.defaultPage(); + + return mesureRecordsResponsePage; + } + + @Override + public Page certificationByCustomerId(Long customerId) { + Page page = PageFactory.defaultPage(); + QueryWrapper wrapper = new QueryWrapper() + .eq("customer_id", customerId); + Page certificationResponsePage = certificationMapper.selectPage(page, wrapper); + return certificationResponsePage; + } + + @Override + public void customerExport(CustomerListRequest request, HttpServletResponse response){ + try { + QueryWrapper wrapper = listParamWrapper(request); + List customerInfoList = this.baseMapper.selectList(wrapper); + iBaseExportService.exportExcel(response, CustomerInfo.class, customerInfoList, ExportEnum.CUSTOMER_EXPORT.getSheetName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private QueryWrapper listParamWrapper(CustomerListRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); + queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); + queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize()); + queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); + queryWrapper.orderByDesc("create_time"); + return queryWrapper; + } + + private void initCustomerInfo(CustomerInfo customerInfo) { + Long maxNo = this.baseMapper.selectMaxCustomerNo(); + String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + AuthUser authUser = ShiroKit.getUser(); + customerInfo.setCreateUser(authUser.getId()); + customerInfo.setUpdateUser(authUser.getId()); + customerInfo.setCustomerNo(customerNo); + } + + private List customerUserDetail(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("customer_id", id); + List customerUserInfoList = customerUserMapper.selectList(queryWrapper); + return customerUserInfoList; + } + + private void userInfoListEditor(List userInfoList) { + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserMapper.updateById(customerUserInfo); + } + } + + private void userInfoListCreator(List userInfoList,Long id) { + Long maxUserNo = customerUserMapper.selectMaxUserNo(); + for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); + String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + customerUserInfo.setUserNo(customerNo); + customerUserMapper.insert(customerUserInfo); + } + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java new file mode 100644 index 0000000..8fdf114 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -0,0 +1,108 @@ +package com.casic.missiles.service.Impl.customer; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.service.customer.CustomerWorkbenchService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@Slf4j +@AllArgsConstructor +public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { + + private final CustomerWorkbenchMapper customerWorkbenchMapper; + + @Override + public ReturnDTO>> sampleIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.sampleIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> querySampleExpireTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.querySampleExpireTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("expireTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("样品到期趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + @Override + public ReturnDTO>> customerIncreaseTrend() { + ReturnDTO>> returnDTO = new ReturnDTO<>(); + try { + List> sampleList = customerWorkbenchMapper.customerIncreaseTrend(); + Map trendMap = sampleList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("increaseTime")), e -> String.valueOf(e.get("count"))) + ); + List> trendMapList = recentYearBuilder(trendMap); + returnDTO.setCode(200); + returnDTO.setData(trendMapList); + returnDTO.setMessage("查询成功"); + } catch (Exception e) { + returnDTO.setCode(500); + returnDTO.setMessage("查询异常"); + log.error("客户新增趋势查询异常，异常信息{}", e.getMessage()); + } + return returnDTO; + } + + // 鉴定金额暂时没有表设计，loading... + @Override + public ReturnDTO>> customerExcellentList() { + + + return null; + } + + private List> recentYearBuilder(Map trendMap) { + List> mapList = new ArrayList<>(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMM"); + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月"); + Calendar beginDate = Calendar.getInstance(); + beginDate.setTime(new Date()); + beginDate.add(Calendar.MONTH, -11); + Calendar endDate = Calendar.getInstance(); + endDate.setTime(new Date()); + while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) { + Map dataMap = new HashMap(); + dataMap.put("date", sdf2.format(beginDate.getTime())); + dataMap.put("count", trendMap.containsKey(sdf1.format(beginDate.getTime())) ? trendMap.get(sdf1.format(beginDate.getTime())) : "0"); + mapList.add(dataMap); + beginDate.add(Calendar.MONTH, 1); + } + return mapList; + } + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 2889804..c450b4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -228,6 +228,8 @@ toBeApprovedList.forEach(toBeApprovedDTO -> { if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ approval.setTaskId(toBeApprovedDTO.getTaskId()); + //补全可选决策项 + approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); } }); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 265d989..404de6d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -37,9 +37,6 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -110,14 +107,14 @@ new BpmnAutoLayout(bpmnModel).execute(); System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); - //验证失败信息的封装ValidationError - List validate = defaultProcessValidator.validate(bpmnModel); - log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); - if (!CollectionUtils.isEmpty(validate)) { - throw new RuntimeException("流程有误，请检查后重试"); - } +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } //流程部署 Deployment deploy = repositoryService.createDeployment() @@ -210,6 +207,15 @@ new BpmnAutoLayout(bpmnModel).execute(); // System.err.println(new String(new BpmnXMLConverter().convertToXML(bpmnModel))); +// ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); +// ProcessValidator defaultProcessValidator = processValidatorFactory.createDefaultProcessValidator(); +// //验证失败信息的封装ValidationError +// List validate = defaultProcessValidator.validate(bpmnModel); +// log.info("更新流程定义，jsonToBpmn获取到的流程定义验证信息为：{}", validate); +// if (!CollectionUtils.isEmpty(validate)) { +// throw new RuntimeException("流程有误，请检查后重试"); +// } + //流程部署,更新 Deployment deploy = repositoryService.createDeployment() .tenantId(directorId)//租户标识符,这是一个字符串,可以是UUID、部门id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java new file mode 100644 index 0000000..c881586 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessCertificateReport; + +/** + *

+ * 业务管理-证书报告 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessCertificateReportService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java new file mode 100644 index 0000000..1d6496d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessEnviromentRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessEnviromentRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java new file mode 100644 index 0000000..16a5b94 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessInterchange; + +/** + *

+ * 业务管理-设备交接单 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessInterchangeService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java new file mode 100644 index 0000000..c388270 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; + +/** + *

+ * 业务管理-实验室检定信息记录表（用于流程中的实验室分配及后续检定过程查询） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java new file mode 100644 index 0000000..145740b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveTemplateInfoService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; + +/** + *

+ * 业务管理-实验室检定信息标准模板表（用于存储推荐的标准的实验室检测顺序） 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessLabExecutiveTemplateInfoService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java new file mode 100644 index 0000000..161a3cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderSampleRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; + +/** + *

+ * 委托书-样品库关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderSampleRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java new file mode 100644 index 0000000..43fb70f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOrder; + +/** + *

+ * 业务管理-委托书 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOrderService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java new file mode 100644 index 0000000..4cc39cf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordEquipmentRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordEquipmentRelation; + +/** + *

+ * 业务管理-原始记录-标准装置关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordEquipmentRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java new file mode 100644 index 0000000..c8f0b89 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordFileRelationService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecordFileRelation; + +/** + *

+ * 业务管理-原始记录-计量文件关联表 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordFileRelationService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java new file mode 100644 index 0000000..84e358c --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.service.business; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessOriginalRecord; + +/** + *

+ * 服务类 + *

+ * + * @author wangpeng + * @since 2023-02-02 + */ +public interface IBusinessOriginalRecordService extends IService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java new file mode 100644 index 0000000..524a15a --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.model.customer.CustomerAdviceInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerAdviceService { + + + Page adviceListPage(Page page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception; + + CustomerAdviceInfo adviceDetail(Long id); + + ReturnDTO updateAdvice(CustomerAdviceInfo customerAdviceInfo); + + ReturnDTO addAdvice(CustomerAdviceInfo customerAdviceInfo); + + void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response); + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java new file mode 100644 index 0000000..461d76d --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java @@ -0,0 +1,31 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.model.customer.CustomerSampleInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerSampleService { + + Page listPage(Page page, CustomerSampleListRequest request) throws Exception; + + ReturnDTO addSample(CustomerSampleInfo customerSampleInfo); + + ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo); + + CustomerSampleInfo sampleDetail(Long id); + + void sampleExport(CustomerSampleListRequest request, HttpServletResponse response); + + ReturnDTO deleteSample(Long id); + + Page mesureRecordsBySampleId(Long id); + + Page certificationBySampleId(Long id); + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java new file mode 100644 index 0000000..4b0b2a6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java @@ -0,0 +1,32 @@ +package com.casic.missiles.service.customer; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.CertificationResponse; +import com.casic.missiles.dto.customer.Info.*; +import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.model.customer.CustomerInfo; + +import javax.servlet.http.HttpServletResponse; + +public interface CustomerService { + + Page listPage(Page page, CustomerListRequest request) throws Exception; + + ReturnDTO addCustomer(CustomerInfo customerInfo); + + ReturnDTO updateCustomer(CustomerInfo customerInfo); + + ReturnDTO customerDetail(Long id); + + Page sampleRecordsByCustomerId(Long customerId); + + Page contractRecordsByCustomerId(Long customerId); + + Page mesureRecordsByCustomerId(Long customerId); + + Page certificationByCustomerId(Long customerId); + + void customerExport(CustomerListRequest request, HttpServletResponse response); + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java new file mode 100644 index 0000000..c8a90b1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.customer; + +import com.casic.missiles.dto.ReturnDTO; + +import java.util.List; +import java.util.Map; + +public interface + + + + + +CustomerWorkbenchService { + + ReturnDTO>> sampleIncreaseTrend(); + + ReturnDTO>> querySampleExpireTrend(); + + ReturnDTO>> customerIncreaseTrend(); + + ReturnDTO>> customerExcellentList(); + +} \ No newline at end of file