From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期六, 02 十二月 2023 17:24:34 +0800 Subject: [PATCH] 盘点查询返回结果修改 --- consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 14 ---- consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 4 consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 24 ++++---- consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java | 2 consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 2 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 6 + consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 4 consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 4 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java | 56 ++++++++++++++++++ consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 16 ++++- consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java | 5 + consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java | 18 ++--- 12 files changed, 105 insertions(+), 50 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java index 965d462..055a230 100644 --- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java +++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java @@ -4,7 +4,7 @@ import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.BaseCategoryParam; import com.consum.base.pojo.ProjectTreeResult; -import com.consum.base.service.BaseCategoryServiceImpl; +import com.consum.base.service.BaseCategoryService; import com.consum.base.service.BaseGoodsTemplateServiceImpl; import com.consum.model.po.BaseCategory; import com.iplatform.model.po.S_user_core; @@ -35,7 +35,7 @@ public class BaseCategoryController extends BaseController { @Autowired - private BaseCategoryServiceImpl baseCategoryService; + private BaseCategoryService baseCategoryService; @Autowired private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java index e72ee86..0a6772f 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java +++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java @@ -13,7 +13,7 @@ import com.consum.base.pojo.response.FormInventoryGoodsVO; import com.consum.base.pojo.response.FormInventoryVO; import com.consum.base.service.FinSysTenantUserServiceImpl; -import com.consum.base.service.LWhFormInventoryServiceImpl; +import com.consum.base.service.LWhFormInventoryService; import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.LWhFormInventory; import com.iplatform.model.po.S_user_core; @@ -52,7 +52,7 @@ public class LWhFormInventoryController extends BaseController { @Autowired - private LWhFormInventoryServiceImpl lWhFormInventoryService; + private LWhFormInventoryService lWhFormInventoryService; @Autowired private FinSysTenantUserServiceImpl finSysTenantUserService; @@ -86,7 +86,7 @@ FinSysTenantUser monitorUserInfo = new FinSysTenantUser(); monitorUserInfo.setId(param.getMonitorUserId()); FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo); - int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser); + int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser); if (result > 0) { return ResponseValue.success(); } @@ -113,7 +113,7 @@ if (sysInfo == null) { return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - GenericPager<LWhFormInventory> pager = this.lWhFormInventoryService.queryList(param, sysInfo); + GenericPager<LWhFormInventory> pager = lWhFormInventoryService.queryList(param, sysInfo); return ResponseValue.success(pager); } @@ -132,10 +132,10 @@ return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖"); } //閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭� - FormInventoryVO formInventoryVO = this.lWhFormInventoryService.queryInventBaseGoodTemplate(id); + FormInventoryVO formInventoryVO = lWhFormInventoryService.queryInventBaseGoodTemplate(id); // 淇濆瓨鍚庤繑鍥炶褰曚俊鎭� - List<FormInventoryGoodsVO> result = this.lWhFormInventoryService.saveInventory(formInventoryVO, id); + FormInventoryVO result = lWhFormInventoryService.saveInventory(formInventoryVO, id); return ResponseValue.success(result); } @@ -175,7 +175,7 @@ FinSysTenantUser monitorUserInfo = new FinSysTenantUser(); monitorUserInfo.setId(param.getMonitorUserId()); FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo); - int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser); + int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser); if (result > 0) { return ResponseValue.success(); @@ -233,7 +233,7 @@ return ResponseValue.error("鍙傛暟閿欒"); } - int num = this.lWhFormInventoryService.updateInventoryInfo(param, 1, null, null); + int num = lWhFormInventoryService.updateInventoryInfo(param, 1, null, null); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�"); } @@ -259,7 +259,7 @@ } S_user_core currentUser = this.getCurrentUser(); FinSysTenantUser sysInfo = this.getSysInfo(); - int num = this.lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo); + int num = lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鐩樼偣澶辫触锛�"); } @@ -284,7 +284,7 @@ if (sysInfo == null) { return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - PageUtil<FormInventoryDetailVO> result = this.lWhFormInventoryService.queryPdDetailList(param, sysInfo); + PageUtil<FormInventoryDetailVO> result = lWhFormInventoryService.queryPdDetailList(param, sysInfo); return ResponseValue.success(result); } @@ -302,12 +302,12 @@ LWhFormInventory lWhFormInventory = new LWhFormInventory(); lWhFormInventory.setId(id); - LWhFormInventory item = this.lWhFormInventoryService.get(lWhFormInventory); + LWhFormInventory item = lWhFormInventoryService.get(lWhFormInventory); if (Objects.isNull(item)) { return ResponseValue.error("鐩樼偣鍗曚笉瀛樺湪"); } BeanUtils.copyProperties(item, formInventoryVO); - List<FormInventoryGoodsVO> formInventoryGoodsVOS = this.lWhFormInventoryService.selectDetailById(id); + List<FormInventoryGoodsVO> formInventoryGoodsVOS = lWhFormInventoryService.selectDetailById(id); formInventoryVO.setFormInventoryGoodsList(formInventoryGoodsVOS); return ResponseValue.success(formInventoryVO); } diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java index fc14402..4041761 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java +++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java @@ -426,6 +426,7 @@ } } + // TODO 浣跨敤浜轰慨鏀硅皟鐢� return ResponseValue.success(); } @@ -497,19 +498,6 @@ return ResponseValue.success(result); } - - @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�") - @ApiImplicitParams({ - @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query") - }) - @GetMapping("/query/detail") - public ResponseValue queryDepartmentTransferOrder(Long agencyId) { - - TransferInfoVO transferInfoVO = new TransferInfoVO(); - - lWhFormTransferService.queryDepartmentTransferOrder(); - return ResponseValue.success(transferInfoVO); - } @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�") @ApiImplicitParams({ diff --git a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java index a2ac052..1d1737c 100644 --- a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java @@ -8,16 +8,15 @@ import com.consum.model.po.BaseWarehouse; import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.WhWarning; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; /** @@ -59,8 +58,8 @@ return; } List<Long> allChangModelList = baseModelIdList.stream() - .distinct() - .collect(Collectors.toList()); + .distinct() + .collect(Collectors.toList()); baseModelIdList = allChangModelList; // 灏嗘暟鎹彃鍏ュ簱瀛橀璀︺�怶H_WARNING銆� @@ -116,7 +115,6 @@ private String KU_CUN_NORMAL_MODEL = "update WH_WARNING set STATES=2 where WAREHOUSE_TYPE=? and BASE_WAREHOUSE_ID=?"; /** - * * @param warehouseType * @param warehouseId * @param normalBaseModelIdList 搴撳瓨姝e父鐨� @@ -132,7 +130,7 @@ StringBuilder sql = new StringBuilder(KU_CUN_NORMAL_MODEL); if (!org.springframework.util.CollectionUtils.isEmpty(normalBaseModelIdList)) { - sql.append(" and BASE_GOODS_MODELS_ID in(").append( org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")"); + sql.append(" and BASE_GOODS_MODELS_ID in(").append(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")"); } return lWhWarningService.update(sql.toString(), params.toArray()); } diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java index 3104725..5e6fc4a 100644 --- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java @@ -31,7 +31,7 @@ @Autowired private CodeGeneratorService codeGeneratorService; @Autowired - private BaseCategoryServiceImpl baseCategoryService; + private BaseCategoryService baseCategoryService; @Autowired private BaseGoodsModelsServiceImpl baseGoodsModelsService; diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java index 0c36214..e1bfc3c 100644 --- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java @@ -53,7 +53,7 @@ @Resource private LWhFormTransferService lWhFormTransferService; @Resource - private BaseCategoryServiceImpl baseCategoryService; + private BaseCategoryService baseCategoryService; @Resource private SDictDataServiceImpl sDictDataService; @Resource diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java index 988d31e..9daeba8 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java +++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java @@ -41,7 +41,7 @@ private LWhProcureModelService lWhProcureModelService; private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; private LWhGoodsService lWhGoodsService; - private LWhFormInventoryServiceImpl lWhFormInventoryService; + private LWhFormInventoryService lWhFormInventoryService; private LWhFormProcureCoreService lWhFormProcureCoreService; private LWhFormOutputServiceImpl lWhFormOutputService; @@ -55,7 +55,7 @@ LWhProcureModelService lWhProcureModelService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsService lWhGoodsService, - LWhFormInventoryServiceImpl lWhFormInventoryService, + LWhFormInventoryService lWhFormInventoryService, LWhFormProcureCoreService lWhFormProcureCoreService, LWhFormOutputServiceImpl lWhFormOutputService diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java new file mode 100644 index 0000000..500e3a2 --- /dev/null +++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java @@ -0,0 +1,56 @@ +package com.consum.base.service; + +import com.consum.base.core.utils.PageUtil; +import com.consum.base.pojo.excel.InventoryExcelTemplate; +import com.consum.base.pojo.query.LWhFormInventoryQry; +import com.consum.base.pojo.request.FormInventoryParam; +import com.consum.base.pojo.request.LWhFormInventoryParam; +import com.consum.base.pojo.response.FormInventoryDetailVO; +import com.consum.base.pojo.response.FormInventoryGoodsVO; +import com.consum.base.pojo.response.FormInventoryVO; +import com.consum.model.po.FinSysTenantUser; +import com.consum.model.po.LWhFormInventory; +import com.iplatform.model.po.S_user_core; +import com.walker.db.page.GenericPager; +import com.walker.jdbc.service.BaseService; +import java.util.List; + +public interface LWhFormInventoryService extends BaseService { + + int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser); + + /** + * @Description 鐩樼偣鍗曞垪琛ㄦ煡璇� + * @Author 鍗㈠簡闃� + * @Date 2023/10/31 + */ + GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo); + + + FormInventoryVO saveInventory(FormInventoryVO dto, Long id); + + + /** + * 淇濆瓨鐩樼偣淇℃伅 + * + * @author 鍗㈠簡闃� + * @date 2023/10/31 + */ + int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo); + + + /** + * @return + * @Description 寮傚父鏄庣粏鍒楄〃鏌ヨ + * @Author 鍗㈠簡闃� + * @Date 2023/11/1 + */ + PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo); + + List<FormInventoryGoodsVO> selectDetailById(Long id); + + FormInventoryVO queryInventBaseGoodTemplate(Long id); + + List<InventoryExcelTemplate> getExportList(Long id); + +} diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java index 13f4f61..9cebb1c 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java @@ -41,7 +41,7 @@ */ @Slf4j @Service -public class LWhFormInventoryServiceImpl extends BaseServiceImpl { +public class LWhFormInventoryServiceImpl extends BaseServiceImpl implements LWhFormInventoryService { @Autowired private CodeGeneratorService codeGeneratorService; @@ -83,6 +83,7 @@ * @Author 鍗㈠簡闃� * @Date 2023/10/31 */ + @Override public int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser) { //鏂板鐩樼偣鍗� LWhFormInventory lWhFormInventory = new LWhFormInventory(); @@ -121,6 +122,7 @@ * @Author 鍗㈠簡闃� * @Date 2023/10/31 */ + @Override public GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) { StringBuilder sql = new StringBuilder(QUERY_LIST); HashMap<String, Object> paramts = new HashMap<>(); @@ -158,7 +160,8 @@ } - public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) { + @Override + public FormInventoryVO saveInventory(FormInventoryVO dto, Long id) { //1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id)); if (lWhFormInventory == null) { @@ -177,8 +180,8 @@ log.error("鐩樼偣鍗曠墿鍝佷负绌�"); } List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id); - - return result; + dto.setFormInventoryGoodsList(result); + return dto; } @@ -189,6 +192,7 @@ * @date 2023/10/31 */ @Transactional(rollbackFor = Exception.class) + @Override public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) { //1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId())); @@ -233,6 +237,7 @@ * @Author 鍗㈠簡闃� * @Date 2023/11/1 */ + @Override public PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) { StringBuilder sql = new StringBuilder(QUERY_PD_DETAIL_LIST); HashMap<String, Object> paramts = new HashMap<>(); @@ -303,6 +308,7 @@ return pageUtil; } + @Override public List<FormInventoryGoodsVO> selectDetailById(Long id) { String sql = "select fig.id, fig.BASE_GOODS_TEMPLATE_ID,fig.GOODS_TEMPLATE_NAME,fig.BASE_GOODS_MODELS_NAME," @@ -319,6 +325,7 @@ return result; } + @Override public FormInventoryVO queryInventBaseGoodTemplate(Long id) { FormInventoryVO formInventoryVO = new FormInventoryVO(); @@ -354,6 +361,7 @@ return formInventoryVO; } + @Override public List<InventoryExcelTemplate> getExportList(Long id) { String sql = "SELECT\n" + "\tfi.INVENTORY_DATE createTime,\n" diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java index d8573f1..c21a84c 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java +++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java @@ -222,7 +222,11 @@ goodsModelNumList.forEach(itemModelInfo -> { // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙� Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId(); - allChangModelList.add(baseGoodsModelsId); + + //TODO 涓虹┖鏃朵笉鍔犲叆鏇存柊鍒楄〃 + if (baseGoodsModelsId != null) { + allChangModelList.add(baseGoodsModelsId); + } // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鏌愪釜鍨嬪彿鐨勬暟閲� Integer counts = itemModelInfo.getCounts(); diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java similarity index 97% rename from consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java rename to consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java index 8ccb9f5..7b10210 100644 --- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java @@ -1,9 +1,10 @@ -package com.consum.base.service; +package com.consum.base.service.impl; import com.consum.base.Constants; import com.consum.base.core.utils.IdUtil; import com.consum.base.pojo.BaseCategoryParam; import com.consum.base.pojo.ProjectTreeResult; +import com.consum.base.service.BaseCategoryService; import com.consum.model.po.BaseCategory; import com.iplatform.model.po.S_user_core; import com.walker.db.page.GenericPager; @@ -23,7 +24,7 @@ * @Date 2023/10/23 */ @Service -public class BaseCategoryServiceImpl extends BaseServiceImpl { +public class BaseCategoryServiceImpl extends BaseServiceImpl implements BaseCategoryService { private static final String QUERY_TREE_ALL = "select * from base_category where states = 1 order by FATHER_CATEGORY_ID, LEVELS ASC"; diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java index 0015988..85d1297 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java @@ -18,7 +18,7 @@ import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo; import com.consum.base.pojo.response.UsingFormBackModelInfo; import com.consum.base.pojo.response.UsingFormBackVO; -import com.consum.base.service.BaseCategoryServiceImpl; +import com.consum.base.service.BaseCategoryService; import com.consum.base.service.FinSysTenantDepartmentService; import com.consum.base.service.LWhFormTransferService; import com.consum.base.service.UsingFormBackGoodsService; @@ -58,7 +58,7 @@ @Autowired private CodeGeneratorService codeGeneratorService; @Autowired - private BaseCategoryServiceImpl baseCategoryService; + private BaseCategoryService baseCategoryService; @Autowired private UsingFormBackModelService usingFormBackModelService; @Autowired -- Gitblit v1.9.1