fix:优化代码

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java

@@ -149,12 +149,12 @@ public class LetterService {
             String year = String.valueOf(letterEntity.getCreateTime().getYear());
 
             // 替换模板中的占位符 - 律师事务所承诺书
-            contentHtml = contentHtml.replace("律师事务所", departmentEntity.getDepartmentName() + "律师事务所");
+            contentHtml = contentHtml.replace("律师事务所", departmentEntity.getDepartmentName());
             contentHtml = contentHtml.replace("年度", year + "年度");
             contentHtml = contentHtml.replace("主任（签字）：", "主任（签字）：" + employeeEntity.getActualName());
             contentHtml = contentHtml.replace("日期", "               日期：" + letterEntity.getCreateTime().toLocalDate().toString());
             
-            contentText = contentText.replace("律师事务所", departmentEntity.getDepartmentName() + "律师事务所");
+            contentText = contentText.replace("律师事务所", departmentEntity.getDepartmentName());
             contentText = contentText.replace("年度", year + "年度");
             contentText = contentText.replace("主任（签字）：", "主任（签字）：" + employeeEntity.getActualName());
             contentText = contentText.replace("日期", "               日期：" + letterEntity.getCreateTime().toLocalDate());

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java

@@ -520,11 +520,11 @@ public class ServiceApplicationsService {
 
     public ResponseDTO<String> addSubmit(@Valid ServiceApplicationsAddForm addForm) {
         ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(addForm, ServiceApplicationsEntity.class);
-        serviceApplicationsEntity.setRecordStatus(ReviewEnum.APPROVAL.getValue());
+        serviceApplicationsEntity.setFirmAuditStatus(ReviewEnum.APPROVAL.getValue());
-        serviceApplicationsEntity.setReportTime(LocalDateTime.now());
+        //serviceApplicationsEntity.setReportTime(LocalDateTime.now());
         
         // 检查当前用户角色是否为CEO
-        RequestUser requestUser = AdminRequestUtil.getRequestUser();
+        /*RequestUser requestUser = AdminRequestUtil.getRequestUser();
         List<RoleVO> roles = roleEmployeeService.getRoleIdList(requestUser.getUserId());
         if (!roles.isEmpty()) {
             String roleCode = roles.get(0).getRoleCode();
@@ -537,7 +537,7 @@ public class ServiceApplicationsService {
                 serviceApplicationsEntity.setAssociationAuditUser(requestUser.getUserId());
                 serviceApplicationsEntity.setAssociationAuditTime(LocalDateTime.now());
             }
-        }
+        }*/
         
         if (null == addForm.getApplicationId()){
             serviceApplicationsDao.insert(serviceApplicationsEntity);
@@ -607,6 +607,10 @@ public class ServiceApplicationsService {
                         lawyerServiceVO.setQuarterlyServiceCost(BigDecimal.valueOf(Long.valueOf(dictItem.getRemark()) * lawyerImportForms.get(0).getQuarterlyServiceDuration()));
                         lawyerServiceVO.setQuarterlyServiceDuration(lawyerImportForms.get(0).getQuarterlyServiceDuration());
                     });
+                }else {
+                    lawyerServiceVOList.forEach(lawyerServiceVO -> {
+                        lawyerServiceVO.setAnnualServiceCost(BigDecimal.valueOf(Long.valueOf(dictItem.getRemark()) * lawyerServiceVO.getAnnualServiceDuration()));
+                    });
                 }
                 lawyerStatisticsVO.setLawyerServiceVOList(lawyerServiceVOList);
             });