抄送人改为选填

doc/046.20220420v2.5.0_个性化版_湘雅人工质控缺陷反馈/qc_init_v2.5.0_个性化版_湘雅人工质控缺陷反馈.sql

@@ -49,8 +49,8 @@ CREATE TABLE `med_defect_feedback` (
   `sender_name` varchar(32) NOT NULL COMMENT '发送人姓名',
   `receiver_code` varchar(20) NOT NULL COMMENT '接收人编号',
   `receiver_name` varchar(32) NOT NULL COMMENT '接收人姓名',
-  `cc_codes` varchar(255) NOT NULL COMMENT '抄送人编号集合',
-  `cc_names` varchar(1024) NOT NULL COMMENT '抄送人姓名集合',
+  `cc_codes` varchar(255) DEFAULT NULL COMMENT '抄送人编号集合',
+  `cc_names` varchar(1024) DEFAULT NULL COMMENT '抄送人姓名集合',
   `status` char(3) NOT NULL DEFAULT '0' COMMENT '状态 0:待确认|1:已确认',
   `is_deleted` char(3) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',

src/main/java/com/diagbot/facade/MedDefectFeedbackFacade.java

@@ -159,8 +159,10 @@ public class MedDefectFeedbackFacade extends MedDefectFeedbackServiceImpl {
             insert.setCreator(SysUserUtils.getCurrentPrincipleID());
             insert.setSenderCode(SysUserUtils.getCurrentPrincipleID());
             insert.setSenderName(user.getLinkman());
-            insert.setCcCodes(changeQcResultVO.getCcs().stream().map(CCVO::getUserId).collect(Collectors.joining(",")));
-            insert.setCcNames(changeQcResultVO.getCcs().stream().map(CCVO::getName).collect(Collectors.joining(",")));
+            if(ListUtil.isNotEmpty(changeQcResultVO.getCcs())){
+                insert.setCcCodes(changeQcResultVO.getCcs().stream().map(CCVO::getUserId).collect(Collectors.joining(",")));
+                insert.setCcNames(changeQcResultVO.getCcs().stream().map(CCVO::getName).collect(Collectors.joining(",")));
+            }
             //保存结果
             if (!this.save(insert)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "缺陷反馈保存失败！");

src/main/java/com/diagbot/vo/ChangeQcResultVO.java

@@ -53,8 +53,7 @@ public class ChangeQcResultVO {
     @NotBlank(message = "接收人姓名为空")
     private String receiverName;
 
-    @ApiModelProperty(value = "抄送人集合", required = true)
-    @NotEmpty(message = "抄送人集合为空")
+    @ApiModelProperty(value = "抄送人集合")
     private List<CCVO> ccs;
 
     @ApiModelProperty(value = "操作条目 casesEntryId、msg、score必填-（新增缺失除外）")