diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java index 01dee4b..f3fa4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java @@ -91,11 +91,11 @@ private String website; @ApiModelProperty(value = "履约评级id", dataType = "String") + @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE) private String grade; @TableField(exist = false) @ApiModelProperty(value = "履约评级", dataType = "String") - @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.GRADE) @ExcelProperty(value = "履约评级",order =15) private String gradeName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java index 01dee4b..f3fa4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java @@ -91,11 +91,11 @@ private String website; @ApiModelProperty(value = "履约评级id", dataType = "String") + @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE) private String grade; @TableField(exist = false) @ApiModelProperty(value = "履约评级", dataType = "String") - @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.GRADE) @ExcelProperty(value = "履约评级",order =15) private String gradeName; 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 index 947f87a..3a68b15 100644 --- 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 @@ -28,6 +28,7 @@ private static final long serialVersionUID = 1L; private Long id; + @ApiModelProperty(value = "编号", dataType = "String") @ExcelProperty(value = "反馈编号",order = 0) private String adviceNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java index 01dee4b..f3fa4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java @@ -91,11 +91,11 @@ private String website; @ApiModelProperty(value = "履约评级id", dataType = "String") + @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE) private String grade; @TableField(exist = false) @ApiModelProperty(value = "履约评级", dataType = "String") - @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.GRADE) @ExcelProperty(value = "履约评级",order =15) private String gradeName; 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 index 947f87a..3a68b15 100644 --- 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 @@ -28,6 +28,7 @@ private static final long serialVersionUID = 1L; private Long id; + @ApiModelProperty(value = "编号", dataType = "String") @ExcelProperty(value = "反馈编号",order = 0) private String adviceNo; 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 index 85956f5..85918e9 100644 --- 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 @@ -85,7 +85,7 @@ customerInfo.setUpdateUser(authUser.getId()); userInfoListDeletor(customerInfo.getId()); Integer updateFlag = this.baseMapper.updateById(customerInfo); - Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList()); + Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList(),customerInfo.getId()); if (updateFlag > 0 && userUpdateFlag) { return ReturnUtil.success(); } @@ -124,7 +124,6 @@ @Override//暂定不做 public Page contractRecordsByCustomerId(Long customerId) { Page contractRecordsResponsePage = PageFactory.defaultPage(); - return contractRecordsResponsePage; } @@ -197,9 +196,10 @@ } - private Boolean userInfoListEditor(List userInfoList) { + private Boolean userInfoListEditor(List userInfoList,Long id) { Boolean userUpdateFlag = true; for (CustomerUserInfo customerUserInfo : userInfoList) { + customerUserInfo.setCustomerId(id); Integer userUpdateNum = customerUserMapper.insert(customerUserInfo); if (userUpdateNum <= 0) { userUpdateFlag = false;