12.28 lrj

RMS/src/main/java/cn/cslg/report/entity/asso/Synery_CC.java

@@ -28,9 +28,9 @@ public class Synery_CC extends BaseEntity<Synery_CC> {
 
     @Schema(description = "抄送人邮箱")
     @TableField(value = "CC_EMAIL")
-    private Integer ccEmail;
+    private String ccEmail;
 
     @Schema(description = "抄送人姓名")
     @TableField(value = "CC_NAME")
-    private Integer ccName;
+    private String ccName;
 }

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -64,25 +64,15 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         try {
             report.getScenarioList();
             report.setScenarioId(StringUtils.join(report.getScenarioList(), ","));
-            String res1 = outInterfaceService.getClientNameFromPAS(report.getClientId());
-            JSONObject jsonObject = JSONObject.parseObject(res1);
-            String clientName = jsonObject.getString("data");
-            String res2 = outInterfaceService.getPersonNameAndDepart(report.getPersonId(), report.getDepartmentId());
+
             if (report.getAssociateReportId() != null) {
                 LambdaQueryWrapper<Report> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(Report::getId, report.getAssociateReportId());
                 Report assioReport = this.list(wrapper).get(0);
                 report.setAssociateReportName(assioReport.getName());
             }
-            JSONObject jsonObject2 = JSONObject.parseObject(res2);
-            Map<String, Object> map = (Map<String, Object>) jsonObject2.get("data");
-            report.setClientName(clientName);
-            report.setDepartmentName(map.get("departName").toString());
-            report.setPersonName(map.get("personName").toString());
-
             PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
             report.setCreatePersonId(personnelVO.getId());
-            report.setCreatePersonName(personnelVO.getName());
             boolean addFlag = this.save(report);
 
             if (files != null && files.size() != 0) {