huanghai
/
QingLong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

Browse Source
main
kgdxpr 2 years ago
parent e001905b2e 5b97799d69
commit c71ab231c1
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/UnitTest/TestExportExcel.java
Unescape View File

@ -26,7 +26,11 @@ public class TestExportExcel {
String job_name = record.getStr("job_name"); String job_name = record.getStr("job_name");
int job_type = record.getInt("job_type");//任务类型：1：表单，2：EXCEL模板 int job_type = record.getInt("job_type");//任务类型：1：表单，2：EXCEL模板
String table_name = record.getStr("form_table_name");//表格名称 String table_name = record.getStr("form_table_name");//表格名称
if (job_type == 1) {
System.out.println("恭喜，所有操作成功完成！"); System.out.println(table_name);
System.out.println("恭喜，所有操作成功完成！");
} else {
System.out.println("不是 Form填报任务，无法执行！");
}
} }
} }

4
src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
Unescape View File

@ -715,7 +715,7 @@ public class CollectController extends Controller {
@IsLoginInterface({}) @IsLoginInterface({})
@LayUiPageInfoInterface({"page", "limit"}) @LayUiPageInfoInterface({"page", "limit"})
@EmptyInterface({"bureau_type_ids"}) @EmptyInterface({"bureau_type_ids"})
public void getBureauList(int query_type_id, String bureau_type_ids, int org_type_id, String org_name, int page, int limit) { public void getBureauList(int query_type_id, String bureau_type_ids, String org_name, int page, int limit) {
//操作人员 //操作人员
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
//根据人员ID，获取人员所在的单位ID //根据人员ID，获取人员所在的单位ID
@ -728,7 +728,7 @@ public class CollectController extends Controller {
//0:查全市 //0:查全市
//1:只查市直属 //1:只查市直属
//2:查登录人员所在县区 //2:查登录人员所在县区
Page<Record> list = cm.getBureauList(query_type_id, bureau_type_ids, area_id, org_type_id, org_name, page, limit); Page<Record> list = cm.getBureauList(query_type_id, bureau_type_ids, area_id, org_name, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(list)); renderJson(CommonUtil.renderJsonForLayUI(list));
} }

55
src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
Unescape View File

@ -807,7 +807,7 @@ public class CollectModel {
* @param org_type_id * @param org_type_id
* @return * @return
*/ */
public Page<Record> getBureauList(int query_type_id, String bureau_type_ids, String area_id, int org_type_id, String org_name, int page, int limit) { public Page<Record> getBureauList(int query_type_id, String bureau_type_ids, String area_id, String org_name, int page, int limit) {
Kv kv = Kv.create(); Kv kv = Kv.create();
//单位类型：1:教育局，2：学校，3：教辅单位 //单位类型：1:教育局，2：学校，3：教辅单位
List<String> bureau_type_list = Arrays.stream(bureau_type_ids.split(",")).toList(); List<String> bureau_type_list = Arrays.stream(bureau_type_ids.split(",")).toList();
@ -835,28 +835,25 @@ public class CollectModel {
org_type_id org_type_id
*/ */
List<Integer> OrgTypeList = new ArrayList<>(); List<Integer> OrgTypeList = new ArrayList<>();
if (org_type_id != -1) OrgTypeList.add(org_type_id); if (query_type_id == 1) {//市
else { for (String s : bureau_type_list) {
if (query_type_id == 1) {//市 if (s.equals("1")) OrgTypeList.add(11);//县区教育局
for (String s : bureau_type_list) { if (s.equals("2")) {//学校
if (s.equals("1")) OrgTypeList.add(11);//县区教育局 OrgTypeList.add(8);
if (s.equals("2")) {//学校 OrgTypeList.add(9);
OrgTypeList.add(8); OrgTypeList.add(10);
OrgTypeList.add(9);
OrgTypeList.add(10);
}
if (s.equals("3")) OrgTypeList.add(5);//教辅单位
} }
} else if (query_type_id == 2) {//区 if (s.equals("3")) OrgTypeList.add(5);//教辅单位
for (String s : bureau_type_list) { }
if (s.equals("2")) {//学校 } else if (query_type_id == 2) {//区
OrgTypeList.add(15); for (String s : bureau_type_list) {
OrgTypeList.add(16); if (s.equals("2")) {//学校
} OrgTypeList.add(15);
if (s.equals("3")) { OrgTypeList.add(16);
OrgTypeList.add(12);//教辅单位 }
OrgTypeList.add(14);//教辅单位 if (s.equals("3")) {
} OrgTypeList.add(12);//教辅单位
OrgTypeList.add(14);//教辅单位
} }
} }
} }
@ -906,19 +903,19 @@ public class CollectModel {
if (publish_job_type_id == 1) { if (publish_job_type_id == 1) {
if (xiaShuSchool == 1) { if (xiaShuSchool == 1) {
//query_type_id=1:只查市直属 //query_type_id=1:只查市直属
Page<Record> list = getBureauList(1, "2", null, 9, null, 1, 9999); Page<Record> list = getBureauList(1, "2", null, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id")); bureauSet.add(record.getStr("org_id"));
} }
} }
if (xiaShuJiaoFu == 1) { if (xiaShuJiaoFu == 1) {
Page<Record> list = getBureauList(1, "3", null, 5, null, 1, 9999); Page<Record> list = getBureauList(1, "3", null, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id")); bureauSet.add(record.getStr("org_id"));
} }
} }
if (xiaShuJiaoYuJu == 1) { if (xiaShuJiaoYuJu == 1) {
Page<Record> list = getBureauList(1, "1", null, 11, null, 1, 9999); Page<Record> list = getBureauList(1, "1", null, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id")); bureauSet.add(record.getStr("org_id"));
} }
@ -928,13 +925,13 @@ public class CollectModel {
else if (publish_job_type_id == 2) { else if (publish_job_type_id == 2) {
if (xiaShuSchool == 1) { if (xiaShuSchool == 1) {
//query_type_id=2:查县区属 //query_type_id=2:查县区属
Page<Record> list = getBureauList(2, "2", area_id, 9, null, 1, 9999); Page<Record> list = getBureauList(2, "2", area_id, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id")); bureauSet.add(record.getStr("org_id"));
} }
} }
if (xiaShuJiaoFu == 1) { if (xiaShuJiaoFu == 1) {
Page<Record> list = getBureauList(2, "3", area_id, 5, null, 1, 9999); Page<Record> list = getBureauList(2, "3", area_id, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id")); bureauSet.add(record.getStr("org_id"));
} }
@ -1586,14 +1583,14 @@ public class CollectModel {
//获取此县区的所有学校 //获取此县区的所有学校
Set<String> targetSet = new HashSet<>(); Set<String> targetSet = new HashSet<>();
if (xiaShuSchool == 1) { if (xiaShuSchool == 1) {
Page<Record> list = getBureauList(2,"2", area_id, 16, null, 1, 9999); Page<Record> list = getBureauList(2, "2", area_id, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
targetSet.add(record.getStr("org_id")); targetSet.add(record.getStr("org_id"));
} }
} }
//获取此县区的所有教辅单位 //获取此县区的所有教辅单位
if (xiaShuJiaoFu == 1) { if (xiaShuJiaoFu == 1) {
Page<Record> list = getBureauList(2,"3", area_id, 14, null, 1, 9999); Page<Record> list = getBureauList(2, "3", area_id, null, 1, 9999);
for (Record record : list.getList()) { for (Record record : list.getList()) {
targetSet.add(record.getStr("org_id")); targetSet.add(record.getStr("org_id"));
} }

Write Preview
Loading…
Cancel
Save