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

'commit'

Browse Source
main
黄海 2 years ago
parent b6d07cc9a7
commit 5c34be1e60
2 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -754,13 +754,17 @@ public class CollectController extends Controller {
* 1：市级
* 2：县区级
* 3：单位、校级
* @param target_type_id 发布的是面向单位的任务1，还是面向人员的任务2
* @param fill_type_id 填报任务类型：1：填报，2：转发，3：填报+转发
*/
@Before({POST.class})
@IsLoginInterface({})
@IsNumericInterface({"job_id", "publish_job_type_id", "xiaShuSchool", "xiaShuJiaoFu", "xiaShuJiaoYuJu", "fill_type_id"})
@EmptyInterface({"deadline_time"})
public void publishJob(int job_id, String deadline_time, int publish_job_type_id, int xiaShuSchool,
int xiaShuJiaoFu, int xiaShuJiaoYuJu, String bureauIds, String groupIds, String memo, int fill_type_id) throws ParseException {
int xiaShuJiaoFu, int xiaShuJiaoYuJu, String bureauIds, String groupIds, String memo,
int fill_type_id, int target_type_id) throws ParseException {
if (target_type_id == 0) target_type_id = 1;//默认是发布到单位
if (fill_type_id == 0) fill_type_id = 1;//填报是默认值,不传当1算
//操作人员
@ -773,7 +777,9 @@ public class CollectController extends Controller {
BaseModel bm = new BaseModel();
String area_id = bm.getOrgInfoById(bureau_id).getStr("area_id");
cm.publishJob(job_id, deadline_time, publish_job_type_id,area_id, xiaShuSchool, xiaShuJiaoFu, xiaShuJiaoYuJu, bureauIds, groupIds, memo, fill_type_id);
cm.publishJob(job_id, deadline_time, publish_job_type_id, area_id,
xiaShuSchool, xiaShuJiaoFu, xiaShuJiaoYuJu, bureauIds,
groupIds, memo, fill_type_id, target_type_id);
Map<String, Object> map = new HashMap<>();
map.put("success", true);
map.put("message", "保存成功!");
@ -1479,25 +1485,42 @@ public class CollectController extends Controller {
*
* @param job_id 任务ID
* @param deadline_time 截止时间
* @param allSchool 所有学校
* @param allJiaoFu 所有教辅单位
* @param bureauIds 单位列表
* @param groupIds 组列表
* @param xiaShuSchool 下属学校:如果是县区教育局，可以指定所有下属学校，如果是学校转发，就只能到人了，此值为0
* @param xiaShuJiaoFu 下属教辅单位:如果是县区教育局，可以指定所有下属教辅单位，如果是学校转发，就只能到人了，此值为0
* @param personIds 人员IDS列表:向哪些人员进行转发，未来将支持到人员的转发任务
* @param bureauIds 单位列表:向哪些指定的单位进行转发
* @param groupIds 组列表:向哪些群组进行转发，t_collect_group中添加了一列：group_type_id,1:单位，2：人员
* @param memo 自己的要求说明文字
*/
@Before({POST.class})
@IsLoginInterface({})
@IsNumericInterface({"job_id"})
public void ForwardJob(int job_id, String deadline_time, int allSchool,
int allJiaoFu, String bureauIds, String groupIds) throws ParseException {
public void ForwardJob(int job_id, String deadline_time, int xiaShuSchool, int xiaShuJiaoFu,
String bureauIds, String personIds, String groupIds, String memo) throws ParseException {
//操作人员
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
//检查当前登录人员是不是发布任务的角色
Kv kvCheck = cm.checkPublishRole(person_id);
if (!kvCheck.getBoolean("success")) {
renderJson(kvCheck);
return;
}
//获取登录人员第一个发布任务的角色是什么
int publish_role_id = kvCheck.getInt("publish_role_id");
//根据人员ID，获取人员所在的单位ID
LoginPersonModel personModel = new LoginPersonModel();
Record rs = personModel.getLoginInfoByPersonId(person_id);
String bureau_id = rs.get("bureau_id");
//获取当前登录人员所在的县区ID
LoginPersonModel lm = new LoginPersonModel();
Record personRecord = lm.getLoginInfoByPersonId(person_id);
String area_id = personRecord.getStr("area_id");
//转发任务
int child_job_id = cm.ForwardJob(job_id, deadline_time, allSchool, allJiaoFu, bureauIds, groupIds, bureau_id, person_id);
int child_job_id = cm.ForwardJob(publish_role_id, area_id, job_id, deadline_time, xiaShuSchool, xiaShuJiaoFu, bureauIds, personIds, groupIds, memo, bureau_id, person_id);
//返回
Map<String, Object> map = new HashMap<>();
map.put("success", true);

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

@ -692,12 +692,12 @@ public class CollectModel {
* 功能：查看某个单位对于某个任务的填报情况
*
* @param job_id
* @param bureau_id
* @param target_id
* @return
*/
public Record viewFilledJob(int job_id, String bureau_id) {
String sql = "select * from t_collect_job_target where job_id=? and bureau_id=?";
return Db.findFirst(sql, job_id, bureau_id);
public Record viewFilledJob(int job_id, String target_id) {
String sql = "select * from t_collect_job_target where job_id=? and target_id=?";
return Db.findFirst(sql, job_id, target_id);
}
@ -831,10 +831,12 @@ public class CollectModel {
* 1：市级
* 2：县区级
* 3：单位、校级
* @param target_type_id 1：单位填报，2：人员填报
* @publish_job_type_id 发布类型
*/
public void publishJob(int job_id, String deadline_time, int publish_job_type_id, String area_id, int xiaShuSchool,
int xiaShuJiaoFu, int xiaShuJiaoYuJu, String bureauIds, String groupIds, String memo, int fill_type_id) throws ParseException {
public void publishJob(int job_id, String deadline_time, int publish_job_type_id, String area_id,
int xiaShuSchool, int xiaShuJiaoFu, int xiaShuJiaoYuJu, String bureauIds,
String groupIds, String memo, int fill_type_id, int target_type_id) throws ParseException {
Set<String> bureauSet = new HashSet<>();
//市级发布
if (publish_job_type_id == 1) {
@ -913,12 +915,13 @@ public class CollectModel {
for (String s : bureauSet) {
Record record = new Record();
record.set("job_id", job_id);
record.set("bureau_id", s);
record.set("target_id", s);
record.set("is_finish", 0);
if (xianQuJiaoYuJuSet.contains(s)) record.set("fill_type_id", fill_type_id);//如果是县区教育局，那么前端传啥就是啥
//fill_type_id 填报任务类型：1：填报，2：转发，3：填报+转发
else record.set("fill_type_id", 1);//默认值是填报
list.add(record);
record.set("target_type_id", target_type_id);
}
Db.batchSave("t_collect_job_target", list, 100);
}
@ -1445,42 +1448,44 @@ public class CollectModel {
* 功能：转发任务
* 县区教育局资产管理干事 268
*
* @param job_id 任务ID
* @param deadline_time 截止时间
* @param allSchool 所有学校
* @param allJiaoFu 所有教辅单位
* @param bureauIds 单位列表
* @param groupIds 组列表
* @param publish_role_id 发布者角色
* @param area_id 当前人员所在的县区ID
* @param job_id 任务ID
* @param deadline_time 截止时间
* @param xiaShuSchool 下属学校
* @param xiaShuJiaoFu 下属教辅单位
* @param bureauIds 单位列表
* @param personIds 人员列表
* @param groupIds 组列表
* @param memo 要求
* @param bureau_id 发布者所在单位
* @param person_id 发布人员ID
*/
public int ForwardJob(int job_id, String deadline_time, int allSchool,
int allJiaoFu, String bureauIds, String groupIds, String bureau_id, String person_id) throws ParseException {
public int ForwardJob(int publish_role_id, String area_id, int job_id, String deadline_time, int xiaShuSchool,
int xiaShuJiaoFu, String bureauIds, String personIds,
String groupIds, String memo, String bureau_id, String person_id) throws ParseException {
Record jobRecord = getJob(job_id);
jobRecord.remove("job_id");
jobRecord.set("deadline_time", deadline_time);//截止时间是新的
jobRecord.set("publish_role_id", 268);
jobRecord.set("publish_role_id", publish_role_id);//发布者角色
jobRecord.set("parent_id", job_id);
jobRecord.set("bureau_id", bureau_id);
jobRecord.set("person_id", person_id);
jobRecord.set("memo", memo);
Db.save("t_collect_job", "job_id", jobRecord);
int child_job_id = jobRecord.getInt("job_id");
//获取当前登录人员所在的县区ID
LoginPersonModel lm = new LoginPersonModel();
Record personRecord = lm.getLoginInfoByPersonId(person_id);
String area_id = personRecord.getStr("area_id");
//获取此县区的所有学校
Set<String> bureauSet = new HashSet<>();
if (allSchool == 1) {
Page<Record> list = getBureauList(area_id, 16, null, 0, null, 1, 9999);
if (xiaShuSchool == 1) {
Page<Record> list = getBureauList(2, area_id, 16, null, 0, null, 1, 9999);
for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id"));
}
}
//获取此县区的所有教辅单位
if (allJiaoFu == 1) {
Page<Record> list = getBureauList(area_id, 14, null, 0, null, 1, 9999);
if (xiaShuJiaoFu == 1) {
Page<Record> list = getBureauList(2, area_id, 14, null, 0, null, 1, 9999);
for (Record record : list.getList()) {
bureauSet.add(record.getStr("org_id"));
}
@ -1511,7 +1516,7 @@ public class CollectModel {
for (String s : bureauSet) {
Record record = new Record();
record.set("job_id", child_job_id);
record.set("bureau_id", s);
record.set("target_id", s);
record.set("is_finish", 0);
record.set("fill_type_id", 1);
record.set("parent_id", job_id);

Write Preview
Loading…
Cancel
Save