diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java index 83b6ff5c4..af33049db 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java @@ -47,7 +47,7 @@ public class SystemPDFTemplateRelevanceBizController { systemPDFTemplateRelevanceBizService.insert(systemPDFTemplateRelevanceEntity); } - List sysPdfTemplateRelevanceBizEntityList= systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest); + List sysPdfTemplateRelevanceBizEntityList = systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -63,7 +63,4 @@ public class SystemPDFTemplateRelevanceBizController { } - - - } diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java index 37b586af1..d579e8fc6 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java @@ -33,11 +33,11 @@ public class SystemPDFTemplateRelevanceCodeController { @PostMapping("/system/pdf/templateRelevanceCode/getListByModelId") public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - List ids=new ArrayList<>(); + List ids = new ArrayList<>(); FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest(); filterBussinessTypeRequest.setEnable(true); - List list=systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest); - for (SysPdfTemplateRelevanceCodeEntity obj:list){ + List list = systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest); + for (SysPdfTemplateRelevanceCodeEntity obj : list) { ids.add(obj.getLocalAction()); } @@ -50,7 +50,7 @@ public class SystemPDFTemplateRelevanceCodeController { systemPDFTemplateRelevanceCodeService.insert(systemPDFTemplateRelevanceEntity); } - List sysPdfTemplateRelevanceCodeEntityList= systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest); + List sysPdfTemplateRelevanceCodeEntityList = systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -66,7 +66,4 @@ public class SystemPDFTemplateRelevanceCodeController { } - - - } diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java index d36ecd0ec..92e39d547 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java @@ -26,7 +26,7 @@ public class SystemPDFTemplateRelevanceLabelController { @PostMapping("/system/pdf/templateRelevanceLabel/getListByModelId") public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - List sysPdfTemplateRelevanceLabelEntityList= systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest); + List sysPdfTemplateRelevanceLabelEntityList = systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -42,7 +42,4 @@ public class SystemPDFTemplateRelevanceLabelController { } - - - } diff --git a/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java b/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java index 19a64c476..dbc4cf814 100644 --- a/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java @@ -2,6 +2,8 @@ package com.glxp.api.req.system; import lombok.Data; +import java.util.Date; + @Data public class SysParamConfigSaveRequest { @@ -13,4 +15,5 @@ public class SysParamConfigSaveRequest { private int paramStatus; private int paramType; private String paramExplain; + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index 1fa040276..d9221cac7 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceBizEntityList=sysPdfTemplateRelevanceBizDao.selectList(ew); + List sysPdfTemplateRelevanceBizEntityList = sysPdfTemplateRelevanceBizDao.selectList(ew); return sysPdfTemplateRelevanceBizEntityList; } @@ -38,21 +38,20 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla @Override public boolean udpateRl(SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override public boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) { - + sysPdfTemplateRelevanceBizEntity.setUpdateTime(new Date()); sysPdfTemplateRelevanceBizDao.upInsert(sysPdfTemplateRelevanceBizEntity); - return true; } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 28fdd08e2..737078eeb 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceCodeEntityList=sysPdfTemplateRelevanceCodeDao.selectList(ew); + List sysPdfTemplateRelevanceCodeEntityList = sysPdfTemplateRelevanceCodeDao.selectList(ew); return sysPdfTemplateRelevanceCodeEntityList; } @@ -39,35 +39,35 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl @Override public List selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - QueryWrapper ew=new QueryWrapper<>(); - if(filterPdfTemplateRelevanceRequest.getModelKey()!=null){ - ew.eq("modelKey",filterPdfTemplateRelevanceRequest.getModelKey()); + QueryWrapper ew = new QueryWrapper<>(); + if (filterPdfTemplateRelevanceRequest.getModelKey() != null) { + ew.eq("modelKey", filterPdfTemplateRelevanceRequest.getModelKey()); } return sysPdfTemplateRelevanceCodeDao.selectList(ew); } @Override public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override public boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) { - + sysPdfTemplateRelevanceCodeEntity.setUpdateTime(new Date()); sysPdfTemplateRelevanceCodeDao.upInsert(sysPdfTemplateRelevanceCodeEntity); return false; } @Override public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) { - return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction); + return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name, localAction); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 713cfbbcc..2f2b23fb2 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceLabelEntityList=sysPdfTemplateRelevanceLabelDao.selectList(ew); + List sysPdfTemplateRelevanceLabelEntityList = sysPdfTemplateRelevanceLabelDao.selectList(ew); return sysPdfTemplateRelevanceLabelEntityList; } @@ -38,14 +38,14 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp @Override public boolean udpateRl(SysPdfTemplateRelevanceLabelEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index e060234ca..e9fd4a65b 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceStatemenEntityList=sysPdfTemplateRelevanceStatemenDao.selectList(ew); + List sysPdfTemplateRelevanceStatemenEntityList = sysPdfTemplateRelevanceStatemenDao.selectList(ew); return sysPdfTemplateRelevanceStatemenEntityList; } @@ -38,14 +38,14 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT @Override public boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index f7e12492b..a130793da 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -70,7 +70,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) { - + sysParamConfigSaveRequest.setUpdateTime(new Date()); return systemParamConfigDao.updateById(sysParamConfigSaveRequest); } @@ -82,6 +82,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { + systemParamConfigEntity.setUpdateTime(new Date()); return systemParamConfigDao.insert(systemParamConfigEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index a831e93cc..ae916967e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -151,6 +151,7 @@ public class ThrDeptServiceImpl implements ThrDeptService { thrInvWarehouseEntity.setThirdSysFk(thirdSysFk); thrInvWarehouseEntity.setParentId(response.getCode()); thrInvWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); + thrInvWarehouseEntity.setUpdateTime(new Date()); thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index ad2ffd491..af51cc40a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -80,16 +80,19 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { @Override public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { + thrInvWarehouseEntity.setUpdateTime(new Date()); return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); } @Override public boolean insertInvWarehouses(List thrInvWarehouseEntitys) { + thrInvWarehouseEntitys.forEach(thrInvWarehouseEntity -> thrInvWarehouseEntity.setUpdateTime(new Date())); return thrInvWarehouseDao.insertThrInvWarehouses(thrInvWarehouseEntitys); } @Override public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { + thrInvWarehouseEntity.setUpdateTime(new Date()); return thrInvWarehouseDao.updateThrInvWarehouse(thrInvWarehouseEntity); } diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 4121263bd..6646aafae 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -52,6 +52,7 @@ paramStatus=#{paramStatus}, paramType=#{paramType}, paramExplain=#{paramExplain}, + updateTime=#{updateTime}, WHERE id=#{id} @@ -66,13 +67,14 @@ insert INTO sys_param_config(paramName, - paramKey, paramValue, paramStatus, paramType, paramExplain) + paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime) values (#{paramName}, #{paramKey}, #{paramValue}, #{paramStatus}, #{paramType}, - #{paramExplain}) + #{paramExplain}, + #{updateTime}) - insert - ignore - INTO sys_pdf_template_relevance_biz - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) - values (#{templateId}, - #{customerId}, - #{adminId}, - #{moduleId}, - #{localAction}, - #{remark1}, - #{remark2}, - #{remark3}, - #{printType}, - #{modelKey} -) + insert + ignore + INTO sys_pdf_template_relevance_biz + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey, + updateTime) + values (#{templateId}, + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}, + #{modelKey}, + #{updateTime}) diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml index e281a4ecb..0c2aeeece 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml @@ -58,7 +58,7 @@ insert ignore INTO sys_pdf_template_relevance_code - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey,updateTime) values (#{templateId}, #{customerId}, #{adminId}, @@ -68,7 +68,8 @@ #{remark2}, #{remark3}, #{printType}, - #{modelKey} + #{modelKey}, + #{updateTime} ) diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index 034bc08bb..4bf8afc4f 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -80,27 +80,28 @@ parameterType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity"> replace INTO thr_inv_warehouse - (id, code, `name`, parentId, remark, thirdSysFk) + (id, code, `name`, parentId, remark, thirdSysFk, updateTime) values ( #{id}, #{code}, #{name}, #{parentId}, #{remark}, - #{thirdSysFk} + #{thirdSysFk}, + #{updateTime} ) replace INTO thr_inv_warehouse - (id, code, `name`, parentId, remark, thirdSysFk) + (id, code, `name`, parentId, remark, thirdSysFk,updateTime) VALUES ( #{item.id}, #{item.code}, #{item.name}, #{item.parentId}, - #{item.remark}, #{item.thirdSysFk}) + #{item.remark}, #{item.thirdSysFk}, #{item.updateTime}) @@ -118,6 +119,7 @@ parentId=#{parentId}, remark=#{remark}, thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, WHERE id = #{id}