diff --git a/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx b/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx new file mode 100644 index 00000000..7c09b3e3 Binary files /dev/null and b/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx differ diff --git a/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx b/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx new file mode 100644 index 00000000..7c09b3e3 Binary files /dev/null and b/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx differ diff --git a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java index 4c2cd459..63e872f4 100644 --- a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java +++ b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java @@ -198,6 +198,30 @@ public class GtzzController extends Controller { gm.pass("03", latestProgressId, "OK", 5); } } + //市级审核专家分配 + if (step_code.equals("0305")) { + //找出最新的progress_id + int subject_id = r.getInt("subject_id"); + if (!gm.getZhuanJiaCheckStatus()) { + //(1)自动分配市级验收专家为默认专家黄海 + //检查是不是以前存在过专家记录,是不是生成过下级流水ID + List list = gm.getSubjectExpert(subject_id, step_code, -1); + if (list.isEmpty()) { + //生成下一条流水记录 + List l1 = gm.getSubjectProgress(subject_id); + progress_id = l1.get(l1.size() - 1).getInt("progress_id"); + List l2 = gm.getSubjectProgress(subject_id); + r = l2.get(l2.size() - 1); + gm.updateCheckStatus(r, StepConst.IS_FINISH, CheckConst.WAIT, "", + null, "", "", 0, -1); + gm.passGetNextProgress(progress_id, gm.getSubjectInfo(subject_id).getStr("org_code"), "", 0); + } + gm.saveSubjectExpert(subject_id, GtzzConst.EXPERT_SHIJI, GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT); + //(2)模拟专家对此项目进行市级验收通过,并且,记录评审的回复为OK! + int latestProgressId = gm.getLatestProgressIdBySubjectId(subject_id); + gm.pass("03", latestProgressId, "OK", 14); + } + } return; } //是不是0304(项目单位验收结束),准备触发拷贝市级验收条目 @@ -537,7 +561,8 @@ public class GtzzController extends Controller { if (current_step_code.equals("0308") && is_current == 0) current_step_code = "0401"; kv.set("current_step_code", current_step_code); - //使用Collections.sort方法进行排序 + //5、返回 + // 使用Collections.sort方法进行排序 Collections.sort(finalRes, (r4, r2) -> { // 假设stepNum是Integer类型 Integer num1 = r4.getInt("stepNum");