diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml index 139a627..ebf4733 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml @@ -23,6 +23,7 @@ + @@ -35,7 +36,7 @@ id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, handle_status, effect_user_id, effect_user_name, - acceptance_user_id, acceptance_user_name, reason_and_conclusion, effect_remark, create_time, update_time + acceptance_user_id, acceptance_user_name, acceptance_time, reason_and_conclusion, effect_remark, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java index fdffa63..3035fc2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java @@ -26,4 +26,7 @@ @NotEmpty(message = "实施人名字不能为空") @ApiModelProperty(value = "实施人名字", dataType = "String") private String effectUserName; + + @ApiModelProperty(value = "受理时间", dataType = "String") + private String acceptanceTime; } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml index 139a627..ebf4733 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerSuggestFormMapper.xml @@ -23,6 +23,7 @@ + @@ -35,7 +36,7 @@ id, customer_id, customer_name, customer_dept_id, customer_dept_name, form_name, form_no, lab_code, appeal_user_id, appeal_user_name, create_user_id, create_user_name, suggest_content, remark, approval_status, process_id, handle_status, effect_user_id, effect_user_name, - acceptance_user_id, acceptance_user_name, reason_and_conclusion, effect_remark, create_time, update_time + acceptance_user_id, acceptance_user_name, acceptance_time, reason_and_conclusion, effect_remark, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java index fdffa63..3035fc2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/customer/SuggestFormAcceptanceRequest.java @@ -26,4 +26,7 @@ @NotEmpty(message = "实施人名字不能为空") @ApiModelProperty(value = "实施人名字", dataType = "String") private String effectUserName; + + @ApiModelProperty(value = "受理时间", dataType = "String") + private String acceptanceTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index 9e4f26c..34be6a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -188,6 +188,10 @@ @TableField("acceptance_user_name") private String acceptanceUserName; + @ApiModelProperty(value = "受理时间", dataType = "String") + @TableField("acceptance_time") + private String acceptanceTime; + @ApiModelProperty(value = "实施人id", dataType = "Long") @TableField(value = "effect_user_id", updateStrategy = FieldStrategy.IGNORED) private Long effectUserId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index 9227075..f889041 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.resource; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -23,6 +24,7 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import com.casic.missiles.utils.DictCodeUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -138,6 +140,11 @@ suggestForm.setEffectUserId(request.getEffectUserId()); suggestForm.setEffectUserName(request.getEffectUserName()); suggestForm.setHandleStatus("1");//处置中 + if (StringUtils.isEmpty(request.getAcceptanceTime())) { + suggestForm.setAcceptanceTime(DateUtil.now()); + } else { + suggestForm.setAcceptanceTime(request.getAcceptanceTime()); + } if (this.baseMapper.updateById(suggestForm) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); }