|
|
|
@ -57,7 +57,7 @@ public class GtzzController extends Controller {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
|
|
|
|
|
String org_code =SessionKit.get(getRequest(), getResponse(),"org_code");
|
|
|
|
|
String org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
|
|
|
|
|
Page<Record> list = gm.getToDoStepList(person_id, org_code, data_type, begin_date, end_date, step_code, is_current, keyword, page, limit);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(list));
|
|
|
|
|
}
|
|
|
|
@ -142,7 +142,7 @@ public class GtzzController extends Controller {
|
|
|
|
|
//清除统计缓存
|
|
|
|
|
gm.delTjCache();
|
|
|
|
|
//当前单位代码
|
|
|
|
|
String org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
|
|
|
|
|
String org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
|
|
|
|
|
//判断当前步骤是提交状态,还是处于待审核状态
|
|
|
|
|
Record r = gm.getProgressInfoById(progress_id);
|
|
|
|
|
String step_code = r.getStr("step_code");
|
|
|
|
@ -186,10 +186,23 @@ public class GtzzController extends Controller {
|
|
|
|
|
} else { //1:申请步骤
|
|
|
|
|
kv = gm.passNext(org_code, progress_id, radio_id, message);
|
|
|
|
|
renderJson(kv);
|
|
|
|
|
|
|
|
|
|
//根据学校上报的进度id,查询出这是哪个项目,然后再次查询出这个项目的最新progress_id,就是上面passNext后新产生的
|
|
|
|
|
r = gm.getProgressInfoById(progress_id);
|
|
|
|
|
step_code = r.getStr("step_code");
|
|
|
|
|
if (step_code.equals("0202")) {
|
|
|
|
|
//找出最新的progress_id
|
|
|
|
|
int subject_id = r.getInt("subject_id");
|
|
|
|
|
int latestProgressId = gm.getLatestProgressIdBySubjectId(subject_id);
|
|
|
|
|
if (!gm.getZhuanJiaCheckStatus()) {
|
|
|
|
|
gm.pass("03", latestProgressId, "OK", 5);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
//是不是0304(项目单位验收结束),准备触发拷贝市级验收条目
|
|
|
|
|
if (step_code.equals("0304")) gm.copyYsItem(r.getInt("subject_id"));//复制吧
|
|
|
|
|
|
|
|
|
|
//返回
|
|
|
|
|
kv.set("success", true);
|
|
|
|
|
kv.set("message", "保存成功!");
|
|
|
|
@ -571,7 +584,8 @@ public class GtzzController extends Controller {
|
|
|
|
|
//当前步骤是不是专家审核,专家审核还分两个阶段,每个阶段还细分为组长可以显示,组员不能显示
|
|
|
|
|
if (step_code.equals("0203") || step_code.equals("0307")) {
|
|
|
|
|
//判断当前登录人员是不是组长
|
|
|
|
|
if (gm.checkZjMaster(subject_id, step_code, SessionKit.get(getRequest(), getResponse(), "person_id"))) r2.set("show_button", true);
|
|
|
|
|
if (gm.checkZjMaster(subject_id, step_code, SessionKit.get(getRequest(), getResponse(), "person_id")))
|
|
|
|
|
r2.set("show_button", true);
|
|
|
|
|
else r2.set("show_button", false);
|
|
|
|
|
} else r2.set("show_button", true);
|
|
|
|
|
} else r2.set("show_button", false);
|
|
|
|
@ -639,7 +653,7 @@ public class GtzzController extends Controller {
|
|
|
|
|
renderJson(kv);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
String org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
|
|
|
|
|
String org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
|
|
|
|
|
Page<Record> list = gm.getXmxcList(org_code, step_code, year, subject_type_id, keyword, page, limit);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(list));
|
|
|
|
|
}
|
|
|
|
@ -688,7 +702,7 @@ public class GtzzController extends Controller {
|
|
|
|
|
//判断文件大小大于20mb则返回错误信息,并终止上传,删除上传文件
|
|
|
|
|
long size = picFile.getFile().length();
|
|
|
|
|
if (size > 1024 * 1024 * 20) {
|
|
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
map.put("success", false);
|
|
|
|
|
map.put("message", "xls文件大小大于20MB,请检查是否正确!");
|
|
|
|
|
renderJson(map);
|
|
|
|
@ -826,7 +840,8 @@ public class GtzzController extends Controller {
|
|
|
|
|
}
|
|
|
|
|
//org_code=="":全部
|
|
|
|
|
//org_code=="1":自己单位
|
|
|
|
|
if (!StrKit.isBlank(org_code) && org_code.equals("1")) org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
|
|
|
|
|
if (!StrKit.isBlank(org_code) && org_code.equals("1"))
|
|
|
|
|
org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
|
|
|
|
|
Page<Record> p = gm.querySubject(keyword, subject_type_ids, begin_date, end_date, data_type, sbnd, step_code, is_current, org_code, page, limit);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(p));
|
|
|
|
|
}
|
|
|
|
@ -845,7 +860,8 @@ public class GtzzController extends Controller {
|
|
|
|
|
}
|
|
|
|
|
//org_code=="":全部
|
|
|
|
|
//org_code=="1":自己单位
|
|
|
|
|
if (!StrKit.isBlank(org_code) && org_code.equals("1")) org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
|
|
|
|
|
if (!StrKit.isBlank(org_code) && org_code.equals("1"))
|
|
|
|
|
org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
|
|
|
|
|
Page<Record> p = gm.queryFile(keyword, document_type_ids, subject_type_ids, begin_date, end_date, data_type, sbnd, org_code, page, limit);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(p));
|
|
|
|
|
}
|
|
|
|
@ -897,9 +913,9 @@ public class GtzzController extends Controller {
|
|
|
|
|
int RoleId = gm.getSysRoleByPersonId(person_id);//四种角色中的哪一种?
|
|
|
|
|
String org_code = null;
|
|
|
|
|
if (RoleId == RoleConst.ZXX || RoleId == RoleConst.YEY || RoleId == RoleConst.ZY || RoleId == RoleConst.JFDW) {
|
|
|
|
|
org_code = SessionKit.get(getRequest(), getResponse(),"org_code");
|
|
|
|
|
org_code = SessionKit.get(getRequest(), getResponse(), "org_code");
|
|
|
|
|
//项目进展(学校专用)
|
|
|
|
|
List<Record> tjxmJz = gm.tjxmJz(SessionKit.get(getRequest(), getResponse(),"org_code"));
|
|
|
|
|
List<Record> tjxmJz = gm.tjxmJz(SessionKit.get(getRequest(), getResponse(), "org_code"));
|
|
|
|
|
kv.set("tjxmJz", tjxmJz);
|
|
|
|
|
} else {
|
|
|
|
|
//今年项目概览(市专用)
|
|
|
|
@ -974,7 +990,7 @@ public class GtzzController extends Controller {
|
|
|
|
|
@Before({GET.class})
|
|
|
|
|
@IsLoginInterface({})
|
|
|
|
|
public void getJzList(int is_finish_flag, int page, int limit) {
|
|
|
|
|
Page<Record> p = gm.getJzList(SessionKit.get(getRequest(), getResponse(),"org_code"), is_finish_flag, page, limit);
|
|
|
|
|
Page<Record> p = gm.getJzList(SessionKit.get(getRequest(), getResponse(), "org_code"), is_finish_flag, page, limit);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(p));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|