幼儿评估
This commit is contained in:
parent
796479c5f1
commit
db2ac25df1
@ -219,6 +219,9 @@ export default {
|
|||||||
this.bjmc = response.data.bjmc;
|
this.bjmc = response.data.bjmc;
|
||||||
this.classid = response.data.classid;
|
this.classid = response.data.classid;
|
||||||
this.zbjsxm = response.data.zbjsmc;
|
this.zbjsxm = response.data.zbjsmc;
|
||||||
|
response.ByAssessmentchild.forEach((item) =>
|
||||||
|
this.checkList.push(item.contentid)
|
||||||
|
);
|
||||||
if (response.isAssessment == "0") {
|
if (response.isAssessment == "0") {
|
||||||
this.msgError(
|
this.msgError(
|
||||||
"当前幼儿出生日期不符合评估范围,幼儿评估范围为36-72个月"
|
"当前幼儿出生日期不符合评估范围,幼儿评估范围为36-72个月"
|
||||||
|
@ -88,7 +88,15 @@ public class ByAssessmentchildController extends BaseController {
|
|||||||
for (int i = 0; i < strArr.length; i++) {
|
for (int i = 0; i < strArr.length; i++) {
|
||||||
//System.out.println("contentid:"+strArr[i]);
|
//System.out.println("contentid:"+strArr[i]);
|
||||||
byAssessmentchild.setContentid(Long.valueOf(strArr[i]));
|
byAssessmentchild.setContentid(Long.valueOf(strArr[i]));
|
||||||
iCount = byAssessmentchildService.insertByAssessmentchild(byAssessmentchild);
|
//先判断该项指标是否已添加,添加后不可继续维护
|
||||||
|
ByAssessmentchild byAssessmentchildNew = new ByAssessmentchild();
|
||||||
|
byAssessmentchildNew.setContentid(Long.valueOf(strArr[i]));
|
||||||
|
byAssessmentchildNew.setChildid(byAssessmentchild.getChildid());
|
||||||
|
List<ByAssessmentchild> list = byAssessmentchildService.selectByAssessmentchildList(byAssessmentchildNew);
|
||||||
|
if (list != null && list.size() > 0) {
|
||||||
|
} else {
|
||||||
|
iCount = byAssessmentchildService.insertByAssessmentchild(byAssessmentchild);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,9 @@ import com.ruoyi.common.utils.SecurityUtils;
|
|||||||
import com.ruoyi.common.utils.ServletUtils;
|
import com.ruoyi.common.utils.ServletUtils;
|
||||||
import com.ruoyi.framework.security.LoginUser;
|
import com.ruoyi.framework.security.LoginUser;
|
||||||
import com.ruoyi.framework.security.service.TokenService;
|
import com.ruoyi.framework.security.service.TokenService;
|
||||||
|
import com.ruoyi.project.benyi.domain.ByAssessmentchild;
|
||||||
import com.ruoyi.project.benyi.domain.ByChildContactpeople;
|
import com.ruoyi.project.benyi.domain.ByChildContactpeople;
|
||||||
|
import com.ruoyi.project.benyi.service.IByAssessmentchildService;
|
||||||
import com.ruoyi.project.benyi.service.IByChildContactpeopleService;
|
import com.ruoyi.project.benyi.service.IByChildContactpeopleService;
|
||||||
import com.ruoyi.project.common.SchoolCommon;
|
import com.ruoyi.project.common.SchoolCommon;
|
||||||
import com.ruoyi.project.system.service.ISysDictDataService;
|
import com.ruoyi.project.system.service.ISysDictDataService;
|
||||||
@ -52,6 +54,8 @@ public class ByChildController extends BaseController {
|
|||||||
private IByChildContactpeopleService byChildContactpeopleService;
|
private IByChildContactpeopleService byChildContactpeopleService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysDictDataService sysDictDataService;
|
private ISysDictDataService sysDictDataService;
|
||||||
|
@Autowired
|
||||||
|
private IByAssessmentchildService byAssessmentchildService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询幼儿信息列表
|
* 查询幼儿信息列表
|
||||||
@ -138,7 +142,7 @@ public class ByChildController extends BaseController {
|
|||||||
ByChild byChild = byChildService.selectByChildById(id);
|
ByChild byChild = byChildService.selectByChildById(id);
|
||||||
ajax.put(AjaxResult.DATA_TAG, byChild);
|
ajax.put(AjaxResult.DATA_TAG, byChild);
|
||||||
//根据生日判断评估适用项 36-48:1 48-60:2 60-72:3
|
//根据生日判断评估适用项 36-48:1 48-60:2 60-72:3
|
||||||
System.out.println("csrq:"+byChild.getCsrq());
|
System.out.println("csrq:" + byChild.getCsrq());
|
||||||
if (byChild.getCsrq() != null) {
|
if (byChild.getCsrq() != null) {
|
||||||
int iMonths = schoolCommon.getDifMonth(new Date(), byChild.getCsrq());
|
int iMonths = schoolCommon.getDifMonth(new Date(), byChild.getCsrq());
|
||||||
if (iMonths >= 36 && iMonths <= 48) {
|
if (iMonths >= 36 && iMonths <= 48) {
|
||||||
@ -147,15 +151,19 @@ public class ByChildController extends BaseController {
|
|||||||
ajax.put("isAssessment", 2);
|
ajax.put("isAssessment", 2);
|
||||||
} else if (iMonths >= 60 && iMonths <= 72) {
|
} else if (iMonths >= 60 && iMonths <= 72) {
|
||||||
ajax.put("isAssessment", 3);
|
ajax.put("isAssessment", 3);
|
||||||
}else{
|
} else {
|
||||||
ajax.put("isAssessment", 0);
|
ajax.put("isAssessment", 0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ajax.put("isAssessment", 0);
|
ajax.put("isAssessment", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
ajax.put("trem",schoolCommon.getCurrentXnXq());
|
ajax.put("trem", schoolCommon.getCurrentXnXq());
|
||||||
|
ByAssessmentchild byAssessmentchild = new ByAssessmentchild();
|
||||||
|
byAssessmentchild.setChildid(id);
|
||||||
|
byAssessmentchild.setXn(schoolCommon.getCurrentXnXq());
|
||||||
|
List<ByAssessmentchild> list = byAssessmentchildService.selectByAssessmentchildList(byAssessmentchild);
|
||||||
|
ajax.put("ByAssessmentchild", list);
|
||||||
return ajax;
|
return ajax;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user