diff --git a/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java b/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java index dbf9cab..49282ba 100644 --- a/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java +++ b/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java @@ -1,5 +1,6 @@ package com.dsic.gj_erp.service.xiaochi; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -67,8 +68,15 @@ public class XiaoChiService{ .ifPresent(user-> { _item.setQgfkry(userMap.get(item.getNestExtC05()).getEmployeeNumber()); }); - _item.setQgpgrq(item.getQgkssj()); - _item.setQgfkrq(item.getQgjssj()); + try { + DateTime qgkssj = DateUtil.parse(item.getQgkssj()); + _item.setQgpgrq(qgkssj.toString("yyyy/MM/dd HH:mm:ss")); + }catch (Exception ignored){} + + try { + DateTime qgjssj = DateUtil.parse(item.getQgjssj()); + _item.setQgfkrq(qgjssj.toString("yyyy/MM/dd HH:mm:ss")); + }catch (Exception ignored){} _item.setZtForQGFK(); } @@ -78,8 +86,15 @@ public class XiaoChiService{ _item.setHxfkry(userMap.get(item.getNestExtC05()).getEmployeeNumber()); }); - _item.setHxpgrq(item.getQgkssj()); - _item.setHxfkrq(item.getQgjssj()); + try { + DateTime qgkssj = DateUtil.parse(item.getQgkssj()); + _item.setHxpgrq(qgkssj.toString("yyyy/MM/dd HH:mm:ss")); + }catch (Exception ignored){} + + try { + DateTime qgjssj = DateUtil.parse(item.getQgjssj()); + _item.setHxfkrq(qgjssj.toString("yyyy/MM/dd HH:mm:ss")); + }catch (Exception ignored){} _item.setZtForHXFK(); } list.add(_item); diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 3d95e1d..dac027a 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -74,7 +74,7 @@ public class ZyjhService extends ServiceImpl { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() .eq(DmYdjh::getDcCh,dto.getDcCh()).eq(DmYdjh::getDcPl,dto.getDcPl()).ge(DmYdjh::getZt,32); - String pgrq = DateUtil.date().toString("yyyy/MM/dd"); + String pgrq = DateUtil.date().toString("yyyy/MM/dd HH:mm:ss"); switch (dto.getZt()){ case "21": wrapper.set(DmYdjh::getPwpgrq,pgrq).set(DmYdjh::getPwpgry,dto.getForemanId());