From 9ebf416b754fdb6851c1b8c5f3dabb14e43b76d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Sun, 29 Jan 2023 15:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5=E6=8F=92?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrCorpExportLogController.java | 9 ++++++ .../thrsys/FilterThrCorpImportLogRequest.java | 1 + .../api/service/thrsys/ThrCorpsDlService.java | 16 +++++++++- .../thrsys/ThrInvProductsDlService.java | 21 ++++++++++++++ .../impl/ThrCorpExportLogServiceImpl.java | 8 +++++ .../impl/ThrCorpImportDetailServiceImpl.java | 12 ++++++++ .../impl/ThrCorpImportLogServiceImpl.java | 12 ++++++++ .../impl/ThrInvProductsDetailServiceImpl.java | 12 ++++++++ .../ThrInvProductsExportLogServiceImpl.java | 12 ++++++++ .../ThrInvProductsImportLogServiceImpl.java | 12 ++++++++ .../impl/ThrInvProductsServiceImpl.java | 12 ++++++++ .../mybatis/mapper/thrsys/ThrCorpDao.xml | 29 +++++++++++++++---- .../mapper/thrsys/ThrCorpExportLogDao.xml | 10 +++++-- .../mapper/thrsys/ThrCorpImportDetailDao.xml | 22 ++++++++++---- .../mapper/thrsys/ThrCorpImportLogDao.xml | 11 +++++-- .../mapper/thrsys/ThrInvProductsDao.xml | 12 +++++--- .../mapper/thrsys/ThrInvProductsDetailDao.xml | 16 +++++----- .../thrsys/ThrInvProductsExportLogDao.xml | 9 ++++-- .../thrsys/ThrInvProductsImportLogDao.xml | 11 +++++-- .../mybatis/mapper/thrsys/ThrOrderDao.xml | 2 +- .../mapper/thrsys/ThrOrderExportLogDao.xml | 2 +- 21 files changed, 218 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 9b7ab952..05391bf5 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -17,6 +17,7 @@ import com.glxp.api.req.thrsys.ThrCorpExportRequest; import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpExportLogService; import com.glxp.api.service.thrsys.ThrCorpService; import com.glxp.api.service.thrsys.ThrCorpsDlService; @@ -53,6 +54,8 @@ public class ThrCorpExportLogController { @Resource private ErpBasicClient erpBasicClient; + @Resource + private CustomerService customerService; @GetMapping("/udiwms/thrCorp/exportLog/filter") public BaseResponse filter(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest, @@ -140,6 +143,9 @@ public class ThrCorpExportLogController { thrCorpExportLogEntity.setUpdateTime(new Date()); thrCorpExportLogEntity.setDlCount(0); thrCorpExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL); + thrCorpExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); + thrCorpExportLogEntity.setCreateTime(new Date()); thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity); //thrCorpsDlService.genExcel(genKey, thrCorpExportRequest); //修改为导出json文件 @@ -171,6 +177,9 @@ public class ThrCorpExportLogController { thrCorpExportLogEntity.setUpdateTime(new Date()); thrCorpExportLogEntity.setDlCount(0); thrCorpExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP); + thrCorpExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); + thrCorpExportLogEntity.setCreateTime(new Date()); thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity); thrCorpsDlService.uploadSmp(genKey, thrCorpExportRequest); return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!"); diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java index 379b2a69..1293ac56 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java @@ -14,4 +14,5 @@ public class FilterThrCorpImportLogRequest extends ListPageRequest { private String thirdSysFk; private String fromType; private String lastUpdateTime; + private Integer type; } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index 65bf4985..f05c9804 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -16,6 +16,7 @@ import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.system.SyncDataSetService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.ExcelUtil; @@ -54,6 +55,9 @@ public class ThrCorpsDlService { SyncDataSetService syncDataSetService; @Resource HttpOkClient httpOkClient; + @Resource + CustomerService customerService; + public String getIpUrl() { SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); @@ -77,8 +81,11 @@ public class ThrCorpsDlService { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); BeanUtils.copyProperties(item, thrCorpEntity); thrCorpEntity.setUnitId(item.getUnitId()); - thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setUpdateTime(new Date()); + thrCorpEntity.setCreateTime(new Date()); + thrCorpEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrCorpEntity.setUpdateUser(String.valueOf(customerService.getUserId())); + thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setThirdSysFk(thirdSys); return thrCorpEntity; } @@ -93,9 +100,13 @@ public class ThrCorpsDlService { BeanUtils.copyProperties(item, thrProductsEntity); thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setUpdateTime(new Date()); + thrProductsEntity.setCreateTime(new Date()); + thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId())); return thrProductsEntity; } ).collect(Collectors.toList()); + thrCorpService.insertThrCorpss(thrCorpEntities); redisUtil.set(Constant.dlThrProducts, "false"); WebSocketServer.sendInfo("往来单位信息下载已完成，请刷新查看！", "sid"); @@ -275,6 +286,9 @@ public class ThrCorpsDlService { thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setUpdateTime(new Date()); + thrCorpEntity.setCreateTime(new Date()); + thrCorpEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrCorpEntity.setUpdateUser(String.valueOf(customerService.getUserId())); thrCorpEntity.setThirdSysFk(thirdSys); return thrCorpEntity; } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java index 316e19c6..6ac7b4d4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java @@ -10,6 +10,7 @@ import com.glxp.api.http.ErpInvClient; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.util.ExcelUtil; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; @@ -39,6 +40,8 @@ public class ThrInvProductsDlService { ThrInvProductsDetailService thrInvProductsDetailService; @Resource ErpInvClient erpInvClient; + @Resource + CustomerService customerServicel; @Async public void importSelcyInvProducrs(String genKey, String thirdSys, List ThrInvProductResponses) { @@ -60,6 +63,9 @@ public class ThrInvProductsDlService { thrProductsEntity.setGenKeyFk(genKey); thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setUpdateTime(new Date()); + thrProductsEntity.setCreateTime(new Date()); + thrProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -74,6 +80,9 @@ public class ThrInvProductsDlService { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); BeanUtils.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); + thrInvProductsEntity.setCreateTime(new Date()); + thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsEntity; } ).collect(Collectors.toList()); @@ -107,6 +116,9 @@ public class ThrInvProductsDlService { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); BeanUtils.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); + thrInvProductsEntity.setCreateTime(new Date()); + thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsEntity; } ).collect(Collectors.toList()); @@ -194,6 +206,9 @@ public class ThrInvProductsDlService { thrInvProductsImportDetailEntity.setThirdSysFk(thirdSys); thrInvProductsImportDetailEntity.setGenKeyFk(genKey); thrInvProductsImportDetailEntity.setUpdateTime(new Date()); + thrInvProductsImportDetailEntity.setCreateTime(new Date()); + thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsImportDetailEntity; } ).collect(Collectors.toList()); @@ -205,6 +220,9 @@ public class ThrInvProductsDlService { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); BeanUtils.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); + thrInvProductsEntity.setCreateTime(new Date()); + thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsEntity; } ).collect(Collectors.toList()); @@ -243,6 +261,9 @@ public class ThrInvProductsDlService { thrProductsEntity.setGenKeyFk(genKey); thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setUpdateTime(new Date()); + thrProductsEntity.setCreateTime(new Date()); + thrProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrProductsEntity; } ).collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 80838be4..85057910 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -6,17 +6,21 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpExportLogDao; import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { @Resource ThrCorpExportLogDao thrCorpExportLogDao; + @Resource + CustomerService customerService; @Override public ThrCorpExportLogEntity selectByGenKey(String genKey) { @@ -49,6 +53,10 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { @Override public boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { + //塞入创建时间创建人 + thrCorpExportLogEntity.setCreateTime(new Date()); + thrCorpExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); return thrCorpExportLogDao.updateThrCorpExportLog(thrCorpExportLogEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index 2239aedc..ed13d48a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -4,11 +4,13 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpImportDetailDao; import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpImportDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -16,6 +18,8 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic @Resource ThrCorpImportDetailDao thrCorpImportDetailDao; + @Resource + CustomerService customerServicel; @Override public List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { @@ -32,11 +36,19 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic @Override public boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { + thrCorpImportDetailEntity.setUpdateTime(new Date()); + thrCorpImportDetailEntity.setCreateTime(new Date()); + thrCorpImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrCorpImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrCorpImportDetailDao.insertCorpDetailImport(thrCorpImportDetailEntity); } @Override public boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { + thrCorpImportDetailEntity.setUpdateTime(new Date()); + thrCorpImportDetailEntity.setCreateTime(new Date()); + thrCorpImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrCorpImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrCorpImportDetailDao.updateCorpDetailImport(thrCorpImportDetailEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index de2a6c2d..050887ce 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -4,17 +4,21 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpImportLogDao; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { @Resource ThrCorpImportLogDao thrCorpImportLogDao; + @Resource + CustomerService customerServicel; @Override public ThrCorpImportLogEntity selectByGenKey(String genKey) { @@ -43,11 +47,19 @@ public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { @Override public boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity) { + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setCreateTime(new Date()); + thrCorpImportLogEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrCorpImportLogEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrCorpImportLogDao.insertImportLog(thrCorpImportLogEntity); } @Override public boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity) { + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setCreateTime(new Date()); + thrCorpImportLogEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrCorpImportLogEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrCorpImportLogDao.updateImportLog(thrCorpImportLogEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 75f7fb51..81745e75 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -4,11 +4,13 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsDetailDao; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -16,6 +18,8 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ @Resource ThrInvProductsDetailDao thrInvProductsDetailDao; + @Resource + CustomerService customerServicel; @Override public List filterInvProductsDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { @@ -32,11 +36,19 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ @Override public boolean insertInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity) { + thrInvProductsImportDetailEntity.setUpdateTime(new Date()); + thrInvProductsImportDetailEntity.setCreateTime(new Date()); + thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsDetailDao.insertInvProductsDetailImport(thrInvProductsImportDetailEntity); } @Override public boolean updateInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity) { + thrInvProductsImportDetailEntity.setUpdateTime(new Date()); + thrInvProductsImportDetailEntity.setCreateTime(new Date()); + thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsDetailDao.updateInvProductsDetailImport(thrInvProductsImportDetailEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java index 2a87ec30..fd192dcb 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java @@ -4,11 +4,13 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsExportLogDao; import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsExportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -16,6 +18,8 @@ public class ThrInvProductsExportLogServiceImpl implements ThrInvProductsExportL @Resource ThrInvProductsExportLogDao thrInvProductsExportLogDao; + @Resource + CustomerService customerServicel; @Override public ThrInvProductsExportLogEntity selectByGenKey(String genKey) { @@ -43,11 +47,19 @@ public class ThrInvProductsExportLogServiceImpl implements ThrInvProductsExportL @Override public boolean insertThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity) { + thrInvProductsExportLogEntity.setUpdateTime(new Date()); + thrInvProductsExportLogEntity.setCreateTime(new Date()); + thrInvProductsExportLogEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsExportLogEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsExportLogDao.insertThrInvProductsExportLog(thrInvProductsExportLogEntity); } @Override public boolean updateThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity) { + thrInvProductsExportLogEntity.setUpdateTime(new Date()); + thrInvProductsExportLogEntity.setCreateTime(new Date()); + thrInvProductsExportLogEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsExportLogEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsExportLogDao.updateThrInvProductsExportLog(thrInvProductsExportLogEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java index 3080784d..c160647b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java @@ -4,11 +4,13 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsImportLogDao; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -17,6 +19,8 @@ public class ThrInvProductsImportLogServiceImpl implements ThrInvProductsImportL @Resource ThrInvProductsImportLogDao thrInvProductsImportLogDao; + @Resource + CustomerService customerServicel; @Override public List filterThrInvProductsImportLog(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { @@ -33,11 +37,19 @@ public class ThrInvProductsImportLogServiceImpl implements ThrInvProductsImportL @Override public boolean insertImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity) { + thrInvProductsImportLogEntity.setUpdateTime(new Date()); + thrInvProductsImportLogEntity.setCreateTime(new Date()); + thrInvProductsImportLogEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsImportLogEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsImportLogDao.insertImportLog(thrInvProductsImportLogEntity); } @Override public boolean updateImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity) { + thrInvProductsImportLogEntity.setUpdateTime(new Date()); + thrInvProductsImportLogEntity.setCreateTime(new Date()); + thrInvProductsImportLogEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsImportLogEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsImportLogDao.updateImportLog(thrInvProductsImportLogEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 84422962..0698b7f4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -5,11 +5,13 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsDao; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -17,6 +19,8 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { @Resource private ThrInvProductsDao thrInvProductsDao; + @Resource + CustomerService customerServicel; @Override public List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest) { @@ -38,6 +42,10 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { @Override public boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity) { + thrInvProductsEntity.setUpdateTime(new Date()); + thrInvProductsEntity.setCreateTime(new Date()); + thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsDao.insertThrInvProduct(thrInvProductsEntity); } @@ -48,6 +56,10 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { @Override public boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity) { + thrInvProductsEntity.setUpdateTime(new Date()); + thrInvProductsEntity.setCreateTime(new Date()); + thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); + thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); return thrInvProductsDao.updateThrInvProducts(thrInvProductsEntity); } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index dd2d13c2..dd0c5b31 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -29,7 +29,7 @@ INTO thr_corp ( unitId,name,spell,addr,creditNo, - contact,mobile,thirdSysFk,updateTime + contact,mobile,thirdSysFk,updateTime,createUser,createTime,updateUser,remark ) values ( @@ -41,7 +41,11 @@ #{contact}, #{mobile}, #{thirdSysFk}, - #{updateTime} + #{updateTime}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} ) @@ -49,7 +53,7 @@ replace INTO thr_corp ( unitId,name,spell,addr,creditNo, - contact,mobile,thirdSysFk,updateTime + contact,mobile,thirdSysFk,updateTime,createUser,createTime,updateUser,remark ) values @@ -63,7 +67,12 @@ #{item.creditNo}, #{item.contact}, #{item.mobile}, - #{item.thirdSysFk},#{item.updateTime} + #{item.thirdSysFk}, + #{item.updateTime}, + #{item.createUser}, + #{item.createTime}, + #{item.updateUser}, + #{item.remark} ) @@ -96,6 +105,10 @@ mobile=#{mobile}, thirdSysFk=#{thirdSysFk}, updateTime=#{updateTime}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, + remark=#{remark}, WHERE id = #{id} @@ -103,7 +116,7 @@ replace - into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime) + into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime,createUser,createTime,updateUser,remark) values ( #{unitId}, #{spell}, @@ -113,7 +126,11 @@ #{mobile}, #{thirdSysFk}, #{name}, - #{updateTime} + #{updateTime}, + #{item.createUser}, + #{item.createTime}, + #{item.updateUser}, + #{item.remark} ) diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml index 5714d080..3cba3fd1 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml @@ -27,12 +27,15 @@ insert INTO thr_corp_export_log - (genKey,updateTime,dlCount,status,filePath,remark,`type`) + (genKey,updateTime,dlCount,status,filePath,remark,`type`,createUser,createTime,updateUser) values ( #{genKey}, #{updateTime}, - #{dlCount},#{status},#{filePath},#{remark},#{type} + #{dlCount},#{status},#{filePath},#{remark},#{type}, + #{createUser}, + #{createTime}, + #{updateUser} ) @@ -49,6 +52,9 @@ status=#{status}, filePath=#{filePath}, remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE genKey = #{genKey} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml index 082585b1..ac604fca 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml @@ -29,7 +29,7 @@ insert INTO thr_corp_import_detail ( unitId,name,spell,addr,creditNo, - contact,mobile,thirdSysFk,updateTime ,genKeyFk + contact,mobile,thirdSysFk,updateTime ,genKeyFk,createUser,createTime,updateUser,remark ) values ( @@ -41,8 +41,12 @@ #{contact}, #{mobile}, #{thirdSysFk}, - #{updateTime}, - #{genKeyFk} + #{updateTime}, + #{genKeyFk}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} ) @@ -50,7 +54,7 @@ insert INTO thr_corp_import_detail ( unitId,name,spell,addr,creditNo, - contact,mobile,thirdSysFk ,updateTime ,genKeyFk ) + contact,mobile,thirdSysFk ,updateTime ,genKeyFk,createUser,createTime,updateUser,remark ) values @@ -62,7 +66,11 @@ #{item.creditNo}, #{item.contact}, #{item.mobile}, - #{item.thirdSysFk} ,#{item.updateTime},#{item.genKeyFk} ) + #{item.thirdSysFk} ,#{item.updateTime},#{item.genKeyFk}, + #{item.createUser}, + #{item.createTime}, + #{item.updateUser}, + #{item.remark} ) @@ -85,6 +93,10 @@ thirdSysFk=#{thirdSysFk}, updateTime=#{updateTime}, genKeyFk=#{genKeyFk}, + remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml index dc674c03..d1731c5a 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -27,13 +27,17 @@ insert INTO thr_corp_import_log - (genKey,fromType,updateTime,thirdSysFk,status) + (genKey,fromType,updateTime,thirdSysFk,status,createUser,createTime,updateUser,remark) values ( #{genKey}, #{fromType}, #{updateTime}, - #{thirdSysFk},#{status} + #{thirdSysFk},#{status}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark}, ) @@ -51,6 +55,9 @@ thirdSysFk=#{thirdSysFk}, status=#{status}, remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE genKey = #{genKey} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 81f6b622..955b1726 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -45,7 +45,7 @@ inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory, - productDate, expireDate, productName, productId, standard, registerNo, supId, supName + productDate, expireDate, productName, productId, standard, registerNo, supId, supName,createUser,createTime,updateUser,remark ) values ( @@ -54,7 +54,7 @@ #{expirationDate}, #{thirdSysFk},#{batchNo},#{spaceCode},#{spaceName},#{updateTime},#{manufactory}, #{productDate}, #{expireDate}, #{productName}, #{productId}, #{standard}, - #{registerNo}, #{supId}, #{supName} + #{registerNo}, #{supId}, #{supName} #{createUser},#{createTime}, #{updateUser}, #{remark} ) @@ -64,7 +64,7 @@ inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory, - productDate, expireDate, productName, productId, standard, registerNo, supId, supName + productDate, expireDate, productName, productId, standard, registerNo, supId, supName,createUser,createTime,updateUser,remark ) values @@ -76,7 +76,7 @@ #{item.manufacturingDate}, #{item.expirationDate}, #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},#{item.spaceName},#{item.updateTime},#{item.manufactory}, #{item.productDate},#{item.expireDate}, #{item.productName}, #{item.productId}, #{item.standard}, #{item.registerNo}, - #{item.supId}, #{item.supName} + #{item.supId}, #{item.supName},#{item.createUser},#{item.createTime}, #{item.updateUser},#{item.remark} ) @@ -116,6 +116,10 @@ registerNo=#{registerNo}, supId=#{supId}, supName=#{supName}, + remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml index bfd21a2c..a37838c0 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDetailDao.xml @@ -30,16 +30,14 @@ ( inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, - expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime ,genKeyFk + expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime ,genKeyFk,createUser,createTime,updateUser,remark ) values ( #{inventoryCode}, #{inventoryName}, #{count}, #{spec}, - #{warehouseName}, #{warehouseCode}, #{registerCertNo}, #{manufacturingDate}, - #{expirationDate}, + #{warehouseName}, #{warehouseCode}, #{registerCertNo}, #{manufacturingDate},#{expirationDate}, #{thirdSysFk},#{batchNo},#{spaceCode},#{spaceName}, - #{updateTime}, - #{genKeyFk} + #{updateTime},#{genKeyFk},#{createUser},#{createTime}, #{updateUser},#{remark}, ) @@ -48,7 +46,7 @@ ( inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, - expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime ,genKeyFk ) + expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime ,genKeyFk ,createUser,createTime,updateUser,remark) values @@ -57,7 +55,7 @@ #{item.warehouseName}, #{item.warehouseCode}, #{item.registerCertNo}, #{item.manufacturingDate}, #{item.expirationDate}, #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},#{item.spaceName} - ,#{item.updateTime},#{item.genKeyFk} ) + ,#{item.updateTime},#{item.genKeyFk}, #{item.createUser},#{item.createTime} #{item.updateUser},#{item.remark} ) @@ -85,6 +83,10 @@ thirdSysFk=#{thirdSysFk}, updateTime=#{updateTime}, genKeyFk=#{genKeyFk}, + remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml index 6d5dffb0..ad1e8c70 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml @@ -24,12 +24,14 @@ insert INTO thr_inv_products_export_log - (genKey,updateTime,dlCount,status,filePath,remark,`type`) + (genKey,updateTime,dlCount,status,filePath,remark,`type`,createUser,createTime,updateUser) values ( #{genKey}, #{updateTime}, - #{dlCount},#{status},#{filePath},#{remark},#{type} + #{dlCount},#{status},#{filePath},#{remark},#{type},#{createUser}, + #{createTime}, + #{updateUser} ) @@ -46,6 +48,9 @@ status=#{status}, filePath=#{filePath}, remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE genKey = #{genKey} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml index 8b6becc4..29a07654 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml @@ -26,13 +26,17 @@ insert INTO thr_inv_products_import_log - (genKey,fromType,updateTime,thirdSysFk,status) + (genKey,fromType,updateTime,thirdSysFk,status,createUser,createTime,updateUser,remark) values ( #{genKey}, #{fromType}, #{updateTime}, - #{thirdSysFk},#{status} + #{thirdSysFk},#{status}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{remark} ) @@ -50,6 +54,9 @@ thirdSysFk=#{thirdSysFk}, status=#{status}, remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, WHERE genKey = #{genKey} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index d6d04aff..088ee1bc 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -6,7 +6,7 @@