feat(会后管理流程): 基础模块

2023-11-30 18:31:18 +08:00
parent fc78c3c01f
commit 01ef005ef9
26 changed files with 1495 additions and 12 deletions
@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@@ -143,7 +144,11 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
     */
    @Override
    public EnterpriseStandardInspectRectifyPlan queryById(String id) {
-        return getById(id);
+        EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = getById(id);
+        ArrayList<EnterpriseStandardInspectRectifyPlan> enterpriseStandardInspectRectifyPlans = new ArrayList<>();
+        enterpriseStandardInspectRectifyPlans.add(enterpriseStandardInspectRectifyPlan);
+        setProperty(enterpriseStandardInspectRectifyPlans);
+        return enterpriseStandardInspectRectifyPlans.get(0);
    }

    @Override
@@ -158,6 +163,11 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
        List<EnterpriseStandardInspectRectifyPlan> list = list(new LambdaQueryWrapper<EnterpriseStandardInspectRectifyPlan>()
                .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, processEsInspectId)
                .orderByAsc(EnterpriseStandardInspectRectifyPlan::getCreateTime));
+        setProperty(list);
+        return list;
+    }
+
+    private void setProperty(List<EnterpriseStandardInspectRectifyPlan> list) {
        list.forEach(item -> {
            // 填充稽查报告
            EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId());
@@ -169,7 +179,6 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
            // 翻译
            item.setResponseUserDictText(sysUserService.dictByIdsOrUserNames(item.getResponseUser(), ""));
        });
-        return list;
    }
 }

@@ -154,8 +154,22 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		List<LawsStandardization> list = new ArrayList<>();
 		StringBuilder stringBuilder = new StringBuilder();
 		treeToList(treeList, list);
+
+
 		// 获取一二级节点名称
-		getNodeName(lawsStandardization, list, stringBuilder);
+		Optional<LawsStandardization> optional = list.stream().filter(v -> v.getId().equals(lawsStandardization.getId())).findFirst();
+		optional.ifPresent(v -> {
+			if (optional.get().getLevel().equals(2L)){
+				Optional<LawsStandardization> optionalOne = list.stream().filter(o -> o.getId().equals(lawsStandardization.getPid())).findFirst();
+				optionalOne.ifPresent(l -> stringBuilder.append(l.getName()).append("-").append(v.getName()));
+			}else if (optional.get().getLevel().equals(1L)){
+				stringBuilder.append(v.getName());
+			}
+		});
+		if (stringBuilder.length() < 0){
+			getNodeName(lawsStandardization, list, stringBuilder);
+		}
+
 		if (stringBuilder.length() > 0){
 			stringBuilder.append("-");
 		}