diff --git a/src/com/engine/salary/enums/push/PushItemFieldEnum.java b/src/com/engine/salary/enums/push/PushItemFieldEnum.java index 84b4bbbb4..375e21823 100644 --- a/src/com/engine/salary/enums/push/PushItemFieldEnum.java +++ b/src/com/engine/salary/enums/push/PushItemFieldEnum.java @@ -1,7 +1,6 @@ package com.engine.salary.enums.push; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; import com.engine.salary.enums.BaseEnum; import com.engine.salary.util.SalaryDateUtil; import org.apache.commons.lang3.StringUtils; @@ -10,7 +9,7 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.Objects; -import static com.engine.salary.util.SalaryDateUtil.DATE_TIME_FORMATTER_PATTERN; +import static com.engine.salary.util.SalaryDateUtil.DATE_FORMATTER_PATTERN; /** * 推送数据来源 @@ -34,7 +33,7 @@ public enum PushItemFieldEnum implements BaseEnum { TEXT(2, "文本", 85393) { @Override public Object convertValue(String value) { - return StrUtil.isEmpty(value) ? "''" : value; + return String.format("'%s'",value); } }, // DATE(3, "日期", 85393) { @@ -48,28 +47,28 @@ public enum PushItemFieldEnum implements BaseEnum { YEAR(4, "日期文本-年", 85393) { @Override public Object convertValue(String value) { - if (StringUtils.isNotBlank(value) && value.length() > 10 && SalaryDateUtil.parse(value, DATE_TIME_FORMATTER_PATTERN) != null) { + if (StringUtils.isNotBlank(value) && SalaryDateUtil.parse(value, DATE_FORMATTER_PATTERN) != null) { value = value.substring(0, 4); } - return StrUtil.isEmpty(value) ? "''" : value; + return String.format("'%s'",value); } }, YEAR_MONTH(5, "日期文本-年月", 85393) { @Override public Object convertValue(String value) { - if (StringUtils.isNotBlank(value) && value.length() > 10 && SalaryDateUtil.parse(value, DATE_TIME_FORMATTER_PATTERN) != null) { + if (StringUtils.isNotBlank(value) && SalaryDateUtil.parse(value, DATE_FORMATTER_PATTERN) != null) { value = value.substring(0, 7); } - return StrUtil.isEmpty(value) ? "''" : value; + return String.format("'%s'",value); } }, YEAR_MONTH_DAY(6, "日期文本-年月日", 85393) { @Override public Object convertValue(String value) { - if (StringUtils.isNotBlank(value) && value.length() > 10 && SalaryDateUtil.parse(value, DATE_TIME_FORMATTER_PATTERN) != null) { + if (StringUtils.isNotBlank(value) && SalaryDateUtil.parse(value, DATE_FORMATTER_PATTERN) != null) { value = value.substring(0, 10); } - return StrUtil.isEmpty(value) ? "''" : value; + return String.format("'%s'",value); } }; diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java index fb9d9a085..eb8139389 100644 --- a/src/com/engine/salary/service/impl/PushServiceImpl.java +++ b/src/com/engine/salary/service/impl/PushServiceImpl.java @@ -30,8 +30,10 @@ import com.engine.salary.util.valid.ValidUtil; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.formmode.setup.ModeRightInfo; +import weaver.general.TimeUtil; import weaver.hrm.User; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -226,9 +228,23 @@ public class PushServiceImpl extends Service implements PushService { Integer modeId = setting.getModeId(); - - List fields = new ArrayList<>(); - List values = new ArrayList<>(); + List fields = new ArrayList() {{ + add("formmodeid"); + add("modedatacreater"); + add("modedatacreatertype"); + add("modedatacreatedate"); + add("modedatacreatetime"); + }}; + String currDate = TimeUtil.getCurrentDateString(); + SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); + String currTime = sdf.format(new Date()); + List values = new ArrayList() {{ + add(modeId); + add(1); + add(0); + add(String.format("'%s'",currDate)); + add(String.format("'%s'",currTime)); + }}; for (PushSettingItemPO item : pushSettingItemPOS) { //数据库字段 String fieldName = item.getFieldName();