diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java index 2fb9ed41..cc65ce41 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -71,6 +71,51 @@ public enum BasicExportStatusTimeEnum { * 用户数据 */ USER_DATA("user_data","用户数据"), + + /** + * 第三方部门信息 + */ + THR_DEPT("thr_dept","第三方部门信息"), + + /** + * 第三方仓库信息 + */ + THR_WAREHOUSE("thr_warehouse","第三方仓库信息"), + + /** + * 第三方产品信息 + */ + THR_PRODUCTS("thr_products","第三方产品信息"), + + /** + * 第三方往来单位信息 + */ + THR_CORP("thr_corp","第三方往来单位信息"), + + /** + * 系统运行参数 + */ + SYSTEM_PARAM_CONFIG("system_param_config","系统运行参数"), + + /** + * 委托验收 + * */ + ENTRUST_ACCEPT("entrust_accept","委托验收"), + + /** + * 打印设置 + */ + PRINT_CONFIG("print_config","打印设置"), + + /** + * 自动建出入库单设置 + */ + SCAN_CHANGE("scan_change","自动建出入库单设置"), + + /** + * 自动建业务单设置 + */ + BUS_TYPE_CHANGE("bus_type_change","自动建业务单设置"), ; @EnumValue private String key; diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 4b13a5b3..7dedff99 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -40,6 +40,11 @@ public enum BasicExportTypeEnum { * 第三方数据 */ THIRD_DATA("third_data", "第三方数据"), + + /** + * 第三方数据 + */ + SYS_SET_DATA("sys_set_data", "系统设置数据"), ; @EnumValue private String key; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 7ca43545..8291ae8d 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -33,6 +33,7 @@ import com.glxp.api.entity.thrsys.*; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.req.sync.SyncUpLoadRequest; import com.glxp.api.res.sync.*; +import com.glxp.api.service.basic.IBasicBusTypeChangeService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; @@ -51,6 +52,7 @@ import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -324,6 +326,7 @@ public class SpsSyncDownloadController { @ApiOperation("上传同步数据") @PostMapping("sps/sync/upload/data") + @Transactional public Object uploadData(@RequestBody SyncUpLoadRequest upLoadRequest) { try { JSONObject obj = JSONUtil.parseObj(upLoadRequest.getData()); @@ -343,6 +346,9 @@ public class SpsSyncDownloadController { case THIRD_DATA: saveUploadThrData(JSONUtil.toBean(obj, SpsSyncThrDataResponse.class)); break; + case SYS_SET_DATA: + saveUploadSysSettingData(JSONUtil.toBean(obj, SpsSyncSysSettingResponse.class)); + break; case COUNTRY_DI_DATA: } String taskId = obj.getStr("taskId"); @@ -365,6 +371,54 @@ public class SpsSyncDownloadController { } + private final SystemParamConfigDao systemParamConfigDao; + private final EntrustReceDao entrustReceDao; + private final SystemPDFModuleDao systemPDFModuleDao; + private final SystemPDFTemplateDao systemPDFTemplateDao; + private final SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao; + private final SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao; + private final SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao; + private final SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao; + private final BasicBusTypePreDao basicBusTypePreDao; + private final BasicBusTypeChangeDao basicBusTypeChangeDao; + + + private void saveUploadSysSettingData(SpsSyncSysSettingResponse bean) { + + if (CollectionUtil.isNotEmpty(bean.getSystemParamConfigEntities())) { + systemParamConfigDao.insertOrUpdateBatch(bean.getSystemParamConfigEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getEntrustReceEntities())) { + entrustReceDao.insertOrUpdateBatch(bean.getEntrustReceEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getSystemPDFModuleEntities())) { + systemPDFModuleDao.insertOrUpdateBatch(bean.getSystemPDFModuleEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getSystemPDFTemplateEntities())) { + systemPDFTemplateDao.insertOrUpdateBatch(bean.getSystemPDFTemplateEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceCodeEntities())) { + sysPdfTemplateRelevanceCodeDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceCodeEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceBizEntities())) { + sysPdfTemplateRelevanceBizDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceBizEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceLabelEntities())) { + sysPdfTemplateRelevanceLabelDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceLabelEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceStatemenEntities())) { + sysPdfTemplateRelevanceStatemenDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceStatemenEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getBasicBusTypePreEntities())) { + basicBusTypePreDao.insertOrUpdateBatch(bean.getBasicBusTypePreEntities()); + } + if (CollectionUtil.isNotEmpty(bean.getBasicBusTypeChangeEntities())) { + basicBusTypeChangeDao.insertOrUpdateBatch(bean.getBasicBusTypeChangeEntities()); + } + + + } + private final ThrDeptDao thrDeptDao; private final ThrInvWarehouseDao thrInvWarehouseDao; private final ThrProductsDao thrProductsDao; @@ -725,7 +779,7 @@ public class SpsSyncDownloadController { BasicBusTypeChangeDao mapper = batchSession.getMapper(BasicBusTypeChangeDao.class); busTypeChangeEntities.forEach(busTypeChangeEntity -> { - mapper.insertOrUpdate(busTypeChangeEntity); + mapper.insertOrUpdateEntity(busTypeChangeEntity); }); batchSession.commit(); remark.append("业务单据类型：").append(syncDataResponse.getBussinessTypeEntities().size()).append("条\n"); @@ -924,7 +978,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemParamConfigEntities())) { List systemParamConfigEntities = spsSyncSysSettingResponse.getSystemParamConfigEntities(); SystemParamConfigDao mapper = sqlSession.getMapper(SystemParamConfigDao.class); - systemParamConfigEntities.forEach(mapper::insertOrUpdate); + systemParamConfigEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("系统运行参数：").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n"); @@ -933,7 +987,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getEntrustReceEntities())) { List entrustReceEntities = spsSyncSysSettingResponse.getEntrustReceEntities(); EntrustReceDao mapper = sqlSession.getMapper(EntrustReceDao.class); - entrustReceEntities.forEach(mapper::insertOrUpdate); + entrustReceEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("委托验收设置：").append(spsSyncSysSettingResponse.getEntrustReceEntities().size()).append("条\n"); @@ -960,7 +1014,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities())) { List sysPdfTemplateRelevanceCodeEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities(); SysPdfTemplateRelevanceCodeDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceCodeDao.class); - sysPdfTemplateRelevanceCodeEntities.forEach(mapper::insertOrUpdate); + sysPdfTemplateRelevanceCodeEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("扫码单据关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities().size()).append("条\n"); @@ -969,7 +1023,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities())) { List sysPdfTemplateRelevanceBizEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities(); SysPdfTemplateRelevanceBizDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceBizDao.class); - sysPdfTemplateRelevanceBizEntities.forEach(mapper::insertOrUpdate); + sysPdfTemplateRelevanceBizEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("业务单据关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities().size()).append("条\n"); @@ -978,7 +1032,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities())) { List sysPdfTemplateRelevanceLabelEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities(); SysPdfTemplateRelevanceLabelDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceLabelDao.class); - sysPdfTemplateRelevanceLabelEntities.forEach(mapper::insertOrUpdate); + sysPdfTemplateRelevanceLabelEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("内部码打印关联表：").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n"); @@ -987,7 +1041,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities())) { List sysPdfTemplateRelevanceStatemenEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities(); SysPdfTemplateRelevanceStatemenDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceStatemenDao.class); - sysPdfTemplateRelevanceStatemenEntities.forEach(mapper::insertOrUpdate); + sysPdfTemplateRelevanceStatemenEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("资质证书打印关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities().size()).append("条\n"); @@ -1005,7 +1059,7 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities())) { List basicBusTypeChangeEntities = spsSyncSysSettingResponse.getBasicBusTypeChangeEntities(); BasicBusTypeChangeDao mapper = sqlSession.getMapper(BasicBusTypeChangeDao.class); - basicBusTypeChangeEntities.forEach(mapper::insertOrUpdate); + basicBusTypeChangeEntities.forEach(mapper::insertOrUpdateEntity); } sqlSession.commit(); remark.append("自动建业务单设置：").append(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities().size()).append("条\n"); diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index 7ee32b2a..d7764ac3 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -42,7 +42,7 @@ public interface InvSpaceDao extends BaseMapperPlus selectList(InvSpace invSpace); + List selectEntityList(InvSpace invSpace); /** * 查询货位编码和名称 diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index b77ee887..0cc93a07 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -22,5 +22,5 @@ public interface BasicBusTypeChangeDao extends BaseMapperPlus filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); - boolean insertOrUpdate(BasicBusTypeChangeEntity record); + boolean insertOrUpdateEntity(BasicBusTypeChangeEntity record); } diff --git a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java index f8329c09..eef89384 100644 --- a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java @@ -27,6 +27,6 @@ public interface EntrustReceDao extends BaseMapperPlus { List queryPage(FilterParamConfigRequest filterParamConfigRequest); @@ -27,8 +28,8 @@ public interface SystemParamConfigDao { boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest); - boolean insert(SystemParamConfigEntity systemParamConfigEntity); + boolean insertEntity(SystemParamConfigEntity systemParamConfigEntity); - int insertOrUpdate(SystemParamConfigEntity record); + int insertOrUpdateEntity(SystemParamConfigEntity record); } diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java index 3315b091..c0e1f76a 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java @@ -1,17 +1,17 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SysPdfTemplateRelevanceBizDao extends BaseMapper { +public interface SysPdfTemplateRelevanceBizDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); boolean upInsert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); - boolean insertOrUpdate(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); + boolean insertOrUpdateEntity(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java index 14606eb6..073763ca 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java @@ -1,6 +1,6 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { +public interface SysPdfTemplateRelevanceCodeDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); @@ -16,6 +16,6 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { +public interface SysPdfTemplateRelevanceLabelDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); - boolean insertOrUpdate(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity); + boolean insertOrUpdateEntity(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java index f76b59bd..135240c0 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java @@ -1,16 +1,16 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapper { +public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); - boolean insertOrUpdate(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity); + boolean insertOrUpdateEntity(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 01c8f8d7..743f9dac 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SystemPDFModuleDao { +public interface SystemPDFModuleDao extends BaseMapperPlus { List queryPage(FilterPdfModuleRequest filterPDFModuleRequest); @@ -23,7 +24,7 @@ public interface SystemPDFModuleDao { boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); - boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); + boolean insertEntity(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index 4fdf2c8f..7be977ac 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SystemPDFTemplateDao { +public interface SystemPDFTemplateDao extends BaseMapperPlus { List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest); @@ -20,7 +21,7 @@ public interface SystemPDFTemplateDao { boolean updateById(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest); - boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); + boolean insertEntity(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java index f8c128ff..833db9d2 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java @@ -9,6 +9,7 @@ import java.util.Date; @Data @TableName(value = "auth_dept_user") public class DeptUserEntity { + @TableField(value = "deptId") private Long deptId; @TableField(value = "userId") diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java index 72bb1a9e..ee888bc0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java @@ -94,27 +94,39 @@ public class BasicBusTypeChangeEntity { private Integer busBeforeTime; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_ORIGINACTION = "originAction"; + @TableField(exist = false) public static final String COL_ORIGINNAME = "originName"; + @TableField(exist = false) public static final String COL_TARGETACTION = "targetAction"; + @TableField(exist = false) public static final String COL_TYPE = "type"; + @TableField(exist = false) public static final String COL_ENABLE = "enable"; + @TableField(exist = false) public static final String COL_SYSTEMDEFAULT = "systemDefault"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index 2fb15ce0..db722091 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -141,39 +141,57 @@ public class BasicBusTypePreEntity { @TableField(value = "busAuditStatus") private Integer busAuditStatus; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_INTRO = "intro"; + @TableField(exist = false) public static final String COL_ACTION = "action"; + @TableField(exist = false) public static final String COL_INDEX = "index"; + @TableField(exist = false) public static final String COL_BEFORETIME = "beforeTime"; + @TableField(exist = false) public static final String COL_CHANGETYPE = "changeType"; + @TableField(exist = false) public static final String COL_DEFAULTDEPTCODE = "defaultDeptCode"; + @TableField(exist = false) public static final String COL_DEFAULTINVCODE = "defaultInvCode"; + @TableField(exist = false) public static final String COL_DEPTCODE = "deptCode"; + @TableField(exist = false) public static final String COL_INVCODE = "invCode"; + @TableField(exist = false) public static final String COL_ORIGINACTION = "originAction"; + @TableField(exist = false) public static final String COL_CHANGEENABLE = "changeEnable"; + @TableField(exist = false) public static final String COL_SUPPLEMENTALL = "supplementAll"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java index 91e67d3f..b04b2be4 100644 --- a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java @@ -88,29 +88,42 @@ public class EntrustReceEntity { @TableField(value = "entrustEnd") private Integer entrustEnd; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_ACTION = "action"; + @TableField(exist = false) public static final String COL_CURDEPT = "curDept"; + @TableField(exist = false) public static final String COL_CURINV = "curInv"; + @TableField(exist = false) public static final String COL_USERID = "userId"; + @TableField(exist = false) public static final String COL_ENTRUSTDEPT = "entrustDept"; + @TableField(exist = false) public static final String COL_ENTRUSTINV = "entrustInv"; + @TableField(exist = false) public static final String COL_ENTRUSTACTION = "entrustAction"; + @TableField(exist = false) public static final String COL_ENTRUSTUSER = "entrustUser"; + @TableField(exist = false) public static final String COL_FINISHRECE = "finishRece"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; + @TableField(exist = false) public static final String COL_ENTRUSTEND = "entrustEnd"; } diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java index f502e92e..d68ff1d0 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java @@ -1,11 +1,13 @@ package com.glxp.api.entity.system; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("sys_pdf_module") public class SystemPDFModuleEntity { private Integer id; @@ -22,7 +24,4 @@ public class SystemPDFModuleEntity { private String remark2; private String remark3; private String modelKey; - - @TableField(value = "updateTime") - private Date updateTime; } diff --git a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java index 03c43d55..ef7633d2 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java @@ -1,12 +1,17 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("sys_param_config") public class SystemParamConfigEntity { + @TableId(value = "id", type = IdType.AUTO) private int id; private int parentId; private String paramName; diff --git a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java index 6843ac24..cb0b60e5 100644 --- a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java +++ b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.DlEntrustReceEntity; import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.req.basic.BasicEntrustRecRequest; @@ -7,7 +8,7 @@ import com.glxp.api.res.basic.EntrustReceResponse; import java.util.List; -public interface EntrustReceService { +public interface EntrustReceService extends IService { EntrustReceEntity findById(Integer id); diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 8c3aa4c0..3a506e7f 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; @@ -10,7 +11,7 @@ import java.util.List; /** * 补单单据类型Service */ -public interface IBasicBusTypePreService { +public interface IBasicBusTypePreService extends IService { /** * 查询补单单据类型数据列表 diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d..47318400 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; @@ -22,7 +23,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { +public class BasicBusTypePreServiceImpl extends ServiceImpl implements IBasicBusTypePreService { @Resource private BasicBusTypePreDao basicBusTypePreDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index dfccaac6..659daf63 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; @@ -18,7 +19,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class EntrustReceServiceImpl implements EntrustReceService { +public class EntrustReceServiceImpl extends ServiceImpl implements EntrustReceService { @Resource EntrustReceDao entrustReceDao; diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java index 9288355b..be7e2eef 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; @@ -10,7 +11,7 @@ import com.glxp.api.req.system.SysPdfModuleSaveRequest; import java.util.List; -public interface SystemPDFModuleService { +public interface SystemPDFModuleService extends IService { List queryPage(FilterPdfModuleRequest filterPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index e14d4be7..cb22c07d 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SystemPDFTemplateRelevanceBizService { +public interface SystemPDFTemplateRelevanceBizService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java index 2e317b00..f349a8d6 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SystemPDFTemplateRelevanceCodeService { +public interface SystemPDFTemplateRelevanceCodeService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java index 72d6fecb..5a42a453 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java @@ -1,13 +1,14 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SystemPDFTemplateRelevanceLabelService { +public interface SystemPDFTemplateRelevanceLabelService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java index 2b3ded35..66cab014 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java @@ -1,13 +1,14 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SystemPDFTemplateRelevanceStatemenService { +public interface SystemPDFTemplateRelevanceStatemenService extends IService { List getListByModelId(Integer modelId); @@ -16,6 +17,4 @@ public interface SystemPDFTemplateRelevanceStatemenService { boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity); - - } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index 3f2df73b..013dd90d 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -8,7 +9,7 @@ import com.glxp.api.req.system.SysPdfTemplateSaveRequest; import java.util.List; -public interface SystemPDFTemplateService { +public interface SystemPDFTemplateService extends IService { List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index 32cb6c2d..1df29a3d 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; @@ -9,7 +10,7 @@ import java.util.List; import java.util.Map; -public interface SystemParamConfigService { +public interface SystemParamConfigService extends IService { List queryPage(FilterParamConfigRequest FilterParamConfigRequest); diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index 758683bc..8d64e101 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFModuleDao; import com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao; @@ -17,12 +18,12 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { +public class SystemPDFModuleServiceImpl extends ServiceImpl implements SystemPDFModuleService { @Resource SystemPDFModuleDao systemPDFModuleDao; @Resource - SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao; + SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao; @Override @@ -71,7 +72,7 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { @Override public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) { - return systemPDFModuleDao.insert(systemPDFModuleEntity); + return systemPDFModuleDao.insertEntity(systemPDFModuleEntity); } @Override 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 9d3c1e12..0afbcf62 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 @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTemplateRelevanceBizService { +public class SystemPDFTemplateRelevanceBizServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceBizService { @Resource SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao; 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 0d873782..f9227304 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 @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTemplateRelevanceCodeService { +public class SystemPDFTemplateRelevanceCodeServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceCodeService { @Resource SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao; 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 a1351901..5f41460f 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 @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemplateRelevanceLabelService { +public class SystemPDFTemplateRelevanceLabelServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceLabelService { @Resource SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao; 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 0025bd03..2d7dcc38 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 @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFTemplateRelevanceStatemenService { +public class SystemPDFTemplateRelevanceStatemenServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceStatemenService { @Resource SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index 4f2cccc6..78941721 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFTemplateDao; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -14,7 +15,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { +public class SystemPDFTemplateServiceImpl extends ServiceImpl implements SystemPDFTemplateService { @Resource SystemPDFTemplateDao systemPDFTemplateDao; @@ -54,7 +55,7 @@ public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { @Override public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) { - return systemPDFTemplateDao.insert(systemPDFTemplateEntity); + return systemPDFTemplateDao.insertEntity(systemPDFTemplateEntity); } @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 bc1d8421..75d4e671 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 @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -18,7 +19,7 @@ import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) -public class SystemParamConfigServiceImpl implements SystemParamConfigService { +public class SystemParamConfigServiceImpl extends ServiceImpl implements SystemParamConfigService { @Resource SystemParamConfigDao systemParamConfigDao; @@ -82,7 +83,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { systemParamConfigEntity.setUpdateTime(new Date()); - return systemParamConfigDao.insert(systemParamConfigEntity); + return systemParamConfigDao.insertEntity(systemParamConfigEntity); } diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 951a85e7..5d1b0a21 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -293,7 +293,7 @@ - select * from auth_space diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index 5a742cba..6b68be71 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -31,7 +31,7 @@ - + insert into basic_bustype_change diff --git a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 92bd824c..a93b2df5 100644 --- a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -163,7 +163,7 @@ FROM basic_entrust_accept - + insert into basic_entrust_accept diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 1ca244b3..2659ee98 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -65,7 +65,7 @@ WHERE parentId=#{parentId} - + insert INTO sys_param_config(paramName, paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime) values (#{paramName}, @@ -82,7 +82,7 @@ select paramValue from sys_param_config where paramKey = #{key} - + insert into sys_param_config diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml index 4c0912c3..62de48f7 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml @@ -82,7 +82,7 @@ #{updateTime}) - insert into sys_pdf_template_relevance_biz diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml index d12424fe..ab4f2661 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml @@ -94,7 +94,7 @@ - insert into sys_pdf_template_relevance_code diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml index d2e3dead..8d8288fa 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml @@ -60,7 +60,7 @@ - insert into sys_pdf_template_relevance_label diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml index b09f4686..61c7791e 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml @@ -61,7 +61,7 @@ - insert into sys_pdf_template_relevance_statemen diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 58e66ceb..9b467229 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -100,7 +100,7 @@ WHERE id = #{id} - + insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time , templateDlUrl, templateType , remark1, remark2, remark3) diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index b1fa79d5..7fee4045 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -90,7 +90,7 @@ WHERE id = #{id} - + insert INTO sys_pdf_template(name, type, module, param, path, rowCount, qrcodeCount, remark, create_time, update_time, jrxmlPath, bussinessType, bussinessStatus)