diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index bee53cc..7094117 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; + /** *

* 现场检测记录表 服务实现类 @@ -101,6 +104,8 @@ String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setRecorder(authUser.getId()); + siteExecutiveLog.setRecordTime(DateUtil.formatDateTime(new Date())); siteExecutiveLog.setLogNo(originNo); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index d3d5eb4..10979f8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -21,4 +21,6 @@ String OUTSOURCE_PROJECT_CHECK_BEAN_NAME = "outsourceProjectCheckBean"; + String SITE_EXECUTIVE_INFO_BEAN_NAME = "siteExecuteInfoBean"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index c45da69..46e86c6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,7 @@ CERTIFICATE_REPORT_STATUS(CERTIFICATE_REPORT_BEAN_NAME, ""), OUTSOURCE_PROJECT_APPLY(OUTSOURCE_PROJECT_APPLY_BEAN_NAME, ""), OUTSOURCE_PROJECT_CHECK(OUTSOURCE_PROJECT_CHECK_BEAN_NAME, ""), + SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE); @@ -38,6 +39,7 @@ put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS); //证书报告审批通过状态回填 put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY); put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK); + put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批 } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index ec64935..7e725aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -24,4 +24,5 @@ String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请 String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收 String AGREEMENT_APPROVAL = "cwczht"; // 合同 + String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批 } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index 786da2c..3481cd5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -60,7 +60,7 @@ and director_name like concat('%',#{request.directorName},'%') and id in - + #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index f96a510..798b328 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -36,9 +36,9 @@ @TableField("site_executive_name") private String siteExecutiveName; - @ApiModelProperty(value = "负责人id", dataType = "String") + @ApiModelProperty(value = "负责人id", dataType = "Long") @TableField("director_id") - private String directorId; + private Long directorId; @ApiModelProperty(value = "负责人名字", dataType = "String") @TableField("director_name") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 48ff287..b4dfc4d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -190,6 +190,8 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setCreateUser(authUser.getId()); + siteExecutiveInfo.setDirectorId(authUser.getId()); + siteExecutiveInfo.setDirectorName(authUser.getName()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index bee53cc..7094117 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Date; + /** *

* 现场检测记录表 服务实现类 @@ -101,6 +104,8 @@ String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setRecorder(authUser.getId()); + siteExecutiveLog.setRecordTime(DateUtil.formatDateTime(new Date())); siteExecutiveLog.setLogNo(originNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java new file mode 100644 index 0000000..0302b0f --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java @@ -0,0 +1,51 @@ +package com.casic.missiles.service.listeners.processor; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; +import com.casic.missiles.service.listeners.NotifyEventPostProcessor; +import com.casic.missiles.utils.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.Objects; + +/** + * @author zt + *

+ * 外场检测审批通过状态回填 + */ +@Slf4j +@Service(ActionStatusBeanEnum.SITE_EXECUTIVE_INFO_BEAN_NAME) +public class SiteExecutiveInfoEventPostProcessor implements NotifyEventPostProcessor { + + @Override + public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) { + Long id = Long.valueOf(notifyEventStatusDTO.getId()); + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + BusinessSiteExecutiveInfoMapper certificateReportMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class); + + BusinessSiteExecutiveInfo siteExecutiveInfo = new BusinessSiteExecutiveInfo(); + siteExecutiveInfo.setId(id); + //设置审批状态为通过 + siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.PASSED); + siteExecutiveInfo.setUpdateTime(DateUtil.formatDateTime(new Date())); + certificateReportMapper.updateById(siteExecutiveInfo); + + //审批通过 根据模板生成审批单打印样例 + + + } + + + +}