Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -25,7 +25,6 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -145,10 +144,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
         alertSubmitted.setCallLogId(alertSubmittedDto.getCallLogId());
         alertSubmitted.setSubmissionMethodCode(alertSubmittedDto.getSubmissionMethodCode());
         Optional<SubmissionMethodEnum> submissionMethodEnum = EnumsUtils.getEnumObject(SubmissionMethodEnum.class,
-                e -> e.getCode().equals(alertSubmittedDto.getBusinessTypeCode()));
+                e -> e.getCode().equals(alertSubmittedDto.getSubmissionMethodCode()));
         alertSubmitted.setSubmissionMethod(submissionMethodEnum.get().getName());
         Optional<AlertSchedulingTypeEnum> alertSchedulingTypeEnum = EnumsUtils.getEnumObject(AlertSchedulingTypeEnum.class,
-                e -> e.getCode().equals(alertSubmittedDto.getBusinessTypeCode()));
+                e -> e.getCode().equals(alertSubmittedDto.getSchedulingTypeCode()));
         alertSubmitted.setSchedulingTypeCode(alertSubmittedDto.getSchedulingTypeCode());
         alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
         alertSubmitted.setSubmissionContent(alertSubmittedDto.getSubmitContent().toJSONString());