From e00e49ba4c64d7de9974e2e2fb238bf687791de7 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 9 Aug 2023 22:24:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcXqxnHistoryController.java | 1 + .../controller/KcZzThpjbController.java | 4 ++- .../kc/kcZzThpjb/entity/KcZzThpjb.java | 9 ++--- .../kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml | 5 +++ .../controller/KcZzXstkbController.java | 5 ++- .../kc/kcZzXstkb/entity/KcZzXstkb.java | 9 ++--- .../kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml | 5 +++ .../controller/KcZzYbtkbController.java | 7 ++-- .../kc/kcZzYbtkb/entity/KcZzYbtkb.java | 9 ++--- .../kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml | 5 +++ .../controller/KcKetangbiaoController.java | 36 ++++++++++++------- .../qa/controller/KcEvaluationController.java | 15 ++++++++ .../modules/kc/qa/entity/KcEvaluation.java | 4 +++ .../tktj/controller/KcTingkeController.java | 16 +++++++-- 14 files changed, 100 insertions(+), 30 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXqxnHistory/controller/KcXqxnHistoryController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXqxnHistory/controller/KcXqxnHistoryController.java index 1259f229..b08a16e9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXqxnHistory/controller/KcXqxnHistoryController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcXqxnHistory/controller/KcXqxnHistoryController.java @@ -68,6 +68,7 @@ public class KcXqxnHistoryController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcXqxnHistory, req.getParameterMap()); + queryWrapper.orderByDesc("start_time"); Page page = new Page(pageNo, pageSize); IPage pageList = kcXqxnHistoryService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java index 111cdf5a..fb8aa6b6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java @@ -707,7 +707,9 @@ public class KcZzThpjbController extends JeecgController0){ + rest = "文件导入成功!数据行数：" + newList.size(); + } if(StringUtils.isNotBlank(errorRest)){ errorRest = "
共错误："+errNum+"行；错误数据如下：
"+errorRest; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java index 98b78d42..83f4da21 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/entity/KcZzThpjb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -215,4 +213,7 @@ public class KcZzThpjb implements Serializable { // @Excel(name = "19.其它建议", width = 15) @ApiModelProperty(value = "19.其它建议") private java.lang.String ans19; + + @TableField(exist = false) + private String xqxn; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml index 82e78e12..35db7a11 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml @@ -2,4 +2,9 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java index 15d0f2ab..a24747b0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java @@ -467,7 +467,10 @@ public class KcZzXstkbController extends JeecgController0){ + rest = "文件导入成功!数据行数：" + newList.size(); + } if(StringUtils.isNotBlank(errorRest)){ errorRest = "
共错误："+errNum+"行；错误数据如下：
"+errorRest; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/entity/KcZzXstkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/entity/KcZzXstkb.java index 7ad6fdca..70de97c1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/entity/KcZzXstkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/entity/KcZzXstkb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -142,4 +140,7 @@ public class KcZzXstkb implements Serializable { @Excel(name = "10.其它建议", width = 15) @ApiModelProperty(value = "10.其它建议") private java.lang.String pjnr; + + @TableField(exist = false) + private String xqxn; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml index f9057621..de826cf3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml @@ -2,4 +2,9 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java index 699b2dd4..073787ac 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java @@ -97,7 +97,7 @@ public class KcZzYbtkbController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcZzYbtkb, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcZzYbtkb, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = kcZzYbtkbService.page(page, queryWrapper); return Result.OK(pageList); @@ -472,7 +472,10 @@ public class KcZzYbtkbController extends JeecgController0){ + rest = "文件导入成功!数据行数：" + newList.size(); + } if(StringUtils.isNotBlank(errorRest)){ errorRest = "
共错误："+errNum+"行；错误数据如下：
"+errorRest; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/entity/KcZzYbtkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/entity/KcZzYbtkb.java index 725eeb43..c2d6143d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/entity/KcZzYbtkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/entity/KcZzYbtkb.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -140,4 +138,7 @@ public class KcZzYbtkb implements Serializable { @Excel(name = "请填写对课堂内容以及其他方面的具体意见或建议", width = 15) @ApiModelProperty(value = "请填写对课堂内容以及其他方面的具体意见或建议") private java.lang.String ans10; + + @TableField(exist = false) + private String xqxn; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml index a92fed41..1924ed6e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml @@ -2,4 +2,9 @@ + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index eb024a97..236e29f6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -21,6 +21,8 @@ import org.jeecg.common.api.CommonAPI; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; @@ -60,6 +62,8 @@ public class KcKetangbiaoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); //查本学期学年的 if(kcKetangbiao.isSearchByNowXqxn()){ - queryWrapper.ge("skrq",getBxqStartTime());//<= - queryWrapper.le("skrq",getBxqEndTime());//>= + KcSysConfig kcSysConfig =kcSysConfigService.getById("1"); + queryWrapper.ge("skrq",kcSysConfig.getBxqkssj());//<= + queryWrapper.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>= } queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')"); queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs()); @@ -345,6 +350,8 @@ public class KcKetangbiaoController extends JeecgController hhjs THEN 1 END ) xkktnum",//【下课课堂数】 "count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】 ); - qw3.ge("skrq",getBxqStartTime());//<= - qw3.le("skrq",skrq);//>= + qw3.ge("skrq",kcSysConfig.getBxqkssj());//<= + qw3.le("skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>= List> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3); if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){ rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0)); } KcKetangbiao kcKetangbiao = new KcKetangbiao(); - kcKetangbiao.setStartTime(getBxqStartTime()); - kcKetangbiao.setEndTime(skrq); + kcKetangbiao.setStartTime(kcSysConfig.getBxqkssj()); + kcKetangbiao.setEndTime(kcSysConfig.getBxqjssj()+" 23:59:59"); List> listTjIndex = kcKetangbiaoService.getIndexYkktstj(kcKetangbiao); if(listTjIndex != null && !listTjIndex.isEmpty()){ rmap.put("yiKaiKeTangNew",listTjIndex.get(0)); @@ -437,10 +444,11 @@ public class KcKetangbiaoController extends JeecgController qw3 = new QueryWrapper<>(); - qw3.ge("kt.skrq",getBxqStartTime());//<= - qw3.le("kt.skrq",skrq);//>= + qw3.ge("kt.skrq",kcSysConfig.getBxqkssj());//<= + qw3.le("kt.skrq",kcSysConfig.getBxqjssj()+" 23:59:59");//>= qw3.eq(StringUtils.isNotBlank(kkdw),"kt.kkdw",kkdw); qw3.eq(StringUtils.isNotBlank(hh),"kt.hh",hh); qw3.eq(StringUtils.isNotBlank(kcxz),"kt.kcxz",kcxz); @@ -486,9 +494,12 @@ public class KcKetangbiaoController extends JeecgController ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) { //查询第三句-已开课堂听课课堂 + + KcSysConfig kcSysConfig =kcSysConfigService.getById("1"); + KcKetangbiao kcKetangbiao = new KcKetangbiao(); - kcKetangbiao.setStartTime(getBxqStartTime()); - kcKetangbiao.setEndTime(skrq); + kcKetangbiao.setStartTime(kcSysConfig.getBxqkssj()); + kcKetangbiao.setEndTime(kcSysConfig.getBxqjssj()+" 23:59:59"); kcKetangbiao.setKkdw(kkdw); kcKetangbiao.setHh(hh); kcKetangbiao.setKcxz(kcxz); @@ -510,9 +521,10 @@ public class KcKetangbiaoController extends JeecgController ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) { //查询第三句-已开课堂听课课堂 + KcSysConfig kcSysConfig =kcSysConfigService.getById("1"); KcKetangbiao kcKetangbiao = new KcKetangbiao(); - kcKetangbiao.setStartTime(getBxqStartTime()); - kcKetangbiao.setEndTime(skrq); + kcKetangbiao.setStartTime(kcSysConfig.getBxqkssj()); + kcKetangbiao.setEndTime(kcSysConfig.getBxqjssj()+" 23:59:59"); kcKetangbiao.setKkdw(kkdw); kcKetangbiao.setHh(hh); kcKetangbiao.setKcxz(kcxz); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index eddc07d4..f49d964e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -18,6 +18,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; +import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService; import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.qa.entity.KcEvaluationPkmx; import org.jeecg.modules.kc.qa.entity.KcEvaluations; @@ -63,6 +64,9 @@ public class KcEvaluationController extends JeecgController kcXqxnHistoryQueryWrapper = new QueryWrapper<>(); + kcXqxnHistoryQueryWrapper.eq("title",xnxq); + kcXqxnHistoryQueryWrapper.last("limit 1"); + KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper); + kcEvaluation.setStartDate(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd")); + kcEvaluation.setEndDate(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd")); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap()); queryWrapper.eq(StringUtils.isNotBlank(kcEvaluation.getJgh()),"kt.jgh",kcEvaluation.getJgh()); queryWrapper.eq("eq.genre",0); + queryWrapper.ge(org.apache.commons.lang3.StringUtils.isNotBlank(kcEvaluation.getStartDate()),"a.up_date",kcEvaluation.getStartDate()); + queryWrapper.le(org.apache.commons.lang3.StringUtils.isNotBlank(kcEvaluation.getEndDate()),"a.up_date",kcEvaluation.getEndDate()+" 23:59:59"); // queryWrapper.eq("a.upuserid",); queryWrapper.orderByDesc("a.up_timestamp"); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java index 9354f609..c761c003 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java @@ -129,6 +129,10 @@ public class KcEvaluation implements Serializable { @TableField(exist = false) private String xnxq;//学期学年 + @TableField(exist = false) + private String startDate;// + @TableField(exist = false) + private String endDate;// diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java index 962a3e73..0f1a78a5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java @@ -19,6 +19,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; +import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService; import org.jeecg.modules.kc.qa.entity.KcEvaluation; import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import org.jeecg.modules.kc.tktj.entity.KcKkdw; @@ -56,6 +57,8 @@ public class KcTingkeController extends JeecgController kcXqxnHistoryQueryWrapper = new QueryWrapper<>(); + kcXqxnHistoryQueryWrapper.eq("title",xnxq); + kcXqxnHistoryQueryWrapper.last("limit 1"); + KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper); + kcTingke.setStartDate(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd")); + kcTingke.setEndDate(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd")); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",kcTingke, req.getParameterMap()); queryWrapper.apply(StringUtils.isNotBlank(kcTingke.getSearchInput()),"( a.kcmc like '%"+kcTingke.getSearchInput()+"%' or a.skjs like '%"+kcTingke.getSearchInput()+"%')"); - queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartTime()),"a.tingketime",kcTingke.getStartDate()); - queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndTime()),"a.tingketime",kcTingke.getEndDate()+" 23:59:59"); + queryWrapper.ge(StringUtils.isNotBlank(kcTingke.getStartDate()),"a.tingketime",kcTingke.getStartDate()); + queryWrapper.le(StringUtils.isNotBlank(kcTingke.getEndDate()),"a.tingketime",kcTingke.getEndDate()+" 23:59:59"); queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getKkdw()),"a.kkdw",kcTingke.getKkdw()); queryWrapper.eq(StringUtils.isNotBlank(kcTingke.getHh()),"a.hh",kcTingke.getHh()); if("0".equals(kcTingke.getPj())){