WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-07-28 11:46:19 +08:00
parent 1ade62ed50 9a0216daa9
commit 71541300f0
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+8 -2
View File
@@ -43,10 +43,16 @@
AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%') AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%')
</if> </if>
<if test="paramsReportDetailEO.sdt !=null and paramsReportDetailEO.sdt !=''"> <if test="paramsReportDetailEO.sdt !=null and paramsReportDetailEO.sdt !=''">
AND sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.sdt}),'%') AND sdt in
<foreach collection="paramsReportDetailEO.sdt.split(',')" index="" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if> </if>
<if test="paramsReportDetailEO.dre !=null and paramsReportDetailEO.dre !=''"> <if test="paramsReportDetailEO.dre !=null and paramsReportDetailEO.dre !=''">
AND dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.dre}),'%') AND dre in
<foreach collection="paramsReportDetailEO.dre.split(',')" index="" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if> </if>
<if test="paramsReportDetailEO.paramsManifestId !=null and paramsReportDetailEO.paramsManifestId !=''"> <if test="paramsReportDetailEO.paramsManifestId !=null and paramsReportDetailEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId} AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+1 -1
View File
@@ -1285,7 +1285,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
if (Date.class.equals(field.getType())) { if (Date.class.equals(field.getType())) {
Date date = (Date) o; Date date = (Date) o;
String pattern = ""; String pattern = "";
if ("deadline".equals(varName)) { if ("syncTime".equals(varName)) {
pattern = "yyyy-MM-dd"; pattern = "yyyy-MM-dd";
} else { } else {
pattern = "yyyy-MM-dd HH:mm:ss"; pattern = "yyyy-MM-dd HH:mm:ss";