yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-05-24 08:44:42 +08:00
parent 74cc98b3e1
commit eedcc7f793
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
View File

@ -18,7 +18,7 @@
when xqbh = 'U' then '全部'
ELSE '' END as xq,
jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl
from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci
from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci and t.kcdl != '毕业设计'
<!-- <if test="startTime != null and startTime != ''">-->
<!-- and sksj > #{startTime}-->
<!-- </if>-->

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java
View File

@ -33,7 +33,7 @@ public class KcEvaluation implements Serializable {
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Integer id;
private java.lang.String id;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "上传日期")

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java
View File

@ -35,7 +35,7 @@ public class KcEvaluations implements Serializable {
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Integer id;
private java.lang.String id;
/**上传日期*/
@Excel(name = "上传日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@ -79,5 +79,5 @@ public class KcEvaluations implements Serializable {
/**问卷版本*/
@Excel(name = "问卷版本", width = 15)
@ApiModelProperty(value = "问卷版本")
private java.lang.Integer evaluationid;
private java.lang.String evaluationid;
}

13
jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java
View File

@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
@ -54,11 +55,18 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
@Transactional(rollbackFor = JeecgBootException.class)
@Override
public void addQaAll(KcEvaluation kcEvaluation) {
DateTime now = DateUtil.date();
Date now = DateUtil.date();
if(kcEvaluation.getUpTimestamp()!=null){
try {
now = DateUtils.parseDate(kcEvaluation.getUpTimestamp(),"yyyy-MM-dd HH:mm:ss");
} catch (ParseException e) {
e.printStackTrace();
}
}
// DateUtil.format(now,"yyyyMMddHHmmssSSS");
kcEvaluation.setUpDate(now);
kcEvaluation.setUpTime(now);
kcEvaluation.setUpTimestamp(now.toString("yyyy-MM-dd HH:mm:ss"));
kcEvaluation.setUpTimestamp(DateUtils.formatDate(now,"yyyy-MM-dd HH:mm:ss"));
// DateUtil.format(now,"yyyy-MM-dd");
save(kcEvaluation);
if(kcEvaluation.getAnsList() != null && !kcEvaluation.getAnsList().isEmpty()){
@ -67,6 +75,7 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
x.setUpDate(kcEvaluation.getUpDate());
x.setUpTime(kcEvaluation.getUpTime());
x.setUpTimestamp(kcEvaluation.getUpTimestamp());
x.setUpuser(kcEvaluation.getUpuser());
});
kcEvaluationsService.saveBatch(kcEvaluation.getAnsList());
}