consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -25,7 +25,6 @@ import org.springframework.web.multipart.MultipartFile; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelDataConvertException; @@ -34,6 +33,7 @@ import com.consum.base.core.utils.MapperUtil; import com.consum.base.pojo.FinSysTenantUserSearchParam; import com.consum.base.pojo.FinSysTenantUserUpdParam; import com.consum.base.pojo.ImportUserParam; import com.consum.base.pojo.response.DepartmentVO; import com.consum.base.pojo.response.FinSysTenantUserVO; import com.consum.base.pojo.response.FinSysTenantVO; @@ -298,80 +298,6 @@ return ResponseValue.success(1); } public static class ImportUserParam { @ExcelProperty("用户姓名") private String userName; @ExcelProperty("用户编号") private String userCode; @ExcelProperty("手机号") private String userPhone; @ExcelProperty("性别(1男，2女)") private Integer sex; @ExcelProperty("电子邮箱") private String email; @ExcelProperty("顺序号") private Long seq; @ExcelProperty("角色名称") private String roleName; public String getUserName() { return userName; } public void setUserName(String userName) { this.userName = userName; } public String getUserCode() { return userCode; } public void setUserCode(String userCode) { this.userCode = userCode; } public String getUserPhone() { return userPhone; } public void setUserPhone(String userPhone) { this.userPhone = userPhone; } public Integer getSex() { return sex; } public void setSex(Integer sex) { this.sex = sex; } public String getEmail() { return email; } public void setEmail(String email) { this.email = email; } public Long getSeq() { return seq; } public void setSeq(Long seq) { this.seq = seq; } public String getRoleName() { return roleName; } public void setRoleName(String roleName) { this.roleName = roleName; } } /** * @Description 批量导入用户 * @Author jlq @@ -557,7 +483,12 @@ */ @PostMapping("/update") @Transactional(rollbackFor = Exception.class) public ResponseValue update(@RequestBody FinSysTenantUser user) { public ResponseValue update() { FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class); FinSysTenantUser formInventoryParam = new FinSysTenantUser(); CommonUtil.copyProperties(user, formInventoryParam); user = formInventoryParam; if (user == null) { return ResponseValue.error("参数为空"); } @@ -611,7 +542,11 @@ */ @PostMapping("/updateStatus") @Transactional(rollbackFor = Exception.class) public ResponseValue updateStatus(@RequestBody FinSysTenantUser user) { public ResponseValue updateStatus() { FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class); FinSysTenantUser formInventoryParam = new FinSysTenantUser(); CommonUtil.copyProperties(user, formInventoryParam); user = formInventoryParam; if (user == null) { return ResponseValue.error("参数为空"); } @@ -739,11 +674,15 @@ /** * 更新角色权限 * * @param user * @return */ @PostMapping("/updRole") public ResponseValue updRole(@RequestBody FinSysTenantUser user) { public ResponseValue updRole() { FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class); FinSysTenantUser finSysTenantParam = new FinSysTenantUser(); CommonUtil.copyProperties(user, finSysTenantParam); user = finSysTenantParam; if (user == null) { return ResponseValue.error("参数为空"); } @@ -767,7 +706,11 @@ */ @PostMapping("/addSupplier") @Transactional(rollbackFor = Exception.class) public ResponseValue addSupplier(@RequestBody FinSysTenantUser user) { public ResponseValue addSupplier() { FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class); FinSysTenantUser finSysTenantParam = new FinSysTenantUser(); CommonUtil.copyProperties(user, finSysTenantParam); user = finSysTenantParam; if (user == null) { return ResponseValue.error("参数为空"); } @@ -879,7 +822,11 @@ @PostMapping("/updatePerson") @Transactional(rollbackFor = Exception.class) public ResponseValue updatePerson(@RequestBody FinSysTenantUser user) { public ResponseValue updatePerson() { FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class); FinSysTenantUser finSysTenantParam = new FinSysTenantUser(); CommonUtil.copyProperties(user, finSysTenantParam); user = finSysTenantParam; if (user == null) { return ResponseValue.error("参数为空"); } @@ -924,7 +871,12 @@ * @Description 修改密码 */ @PostMapping("/updatePassword") public ResponseValue updatePassword(@RequestBody FinSysTenantUserUpdParam param) { public ResponseValue updatePassword() { FinSysTenantUserUpdParam param = CommonUtil.getObjFromReqBody(FinSysTenantUserUpdParam.class); FinSysTenantUserUpdParam finSysTenantParam = new FinSysTenantUserUpdParam(); CommonUtil.copyProperties(param, finSysTenantParam); param = finSysTenantParam; String oldMixPd = param.getOldMixPd(); String newMixPd = param.getNewMixPd(); String btnMixPd = param.getBtnMixPd(); consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -5,7 +5,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -23,10 +25,9 @@ import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.core.utils.MapUtils; import com.consum.base.core.utils.MapperUtil; import com.consum.base.core.utils.PageUtil; import com.consum.base.pojo.LWhFormOutputParam; import com.consum.base.pojo.dto.GoodModelInfoDTO; import com.consum.base.pojo.excel.OutputExcelTemplate; import com.consum.base.pojo.query.LWhFormOutputQry; import com.consum.base.pojo.response.FormOutputGoodsVO; @@ -154,35 +155,48 @@ BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO); lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc()); String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME " + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID " + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id "; Map<String, Object> paramMap = new HashMap<>(); paramMap.put("id", lWhFormOutputExtendVO.getId()); List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil()); List<GoodModelInfoDTO> goodsModelList = lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId()); if (CollectionUtils.isEmpty(goodsModelList)) { return ResponseValue.success(lWhFormOutputExtendVO); } Map<Long, List<GoodModelInfoDTO>> collect = goodsModelList.stream().collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId)); List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList(); for (Map<String, Object> map : procureModelList) { FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class); // 查询型号数量 List<GoodsModelVO> goodsModelVOList = Lists.newArrayList(); String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount " + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID " + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id"; List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil()); modelList.forEach(item -> { GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class); goodsModelVOList.add(goodsModelVO); }); procureTemplateInfoVO.setModels(goodsModelVOList); fromOutputGoods.add(procureTemplateInfoVO); for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : collect.entrySet()) { FormOutputGoodsVO formOutputGoodsVO = getFormOutputGoodsVO(entry); fromOutputGoods.add(formOutputGoodsVO); } lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods); return ResponseValue.success("查询成功!", lWhFormOutputExtendVO); } private static FormOutputGoodsVO getFormOutputGoodsVO(Entry<Long, List<GoodModelInfoDTO>> entry) { Long baseGoodsTemplateId = entry.getKey(); List<GoodModelInfoDTO> goodModelInfoDTOS = entry.getValue(); GoodModelInfoDTO goodModelInfoDTO = goodModelInfoDTOS.stream().findFirst().orElse(null); FormOutputGoodsVO formOutputGoodsVO = new FormOutputGoodsVO(); if (goodModelInfoDTO != null) { formOutputGoodsVO.setId(baseGoodsTemplateId); formOutputGoodsVO.setCategoryId(goodModelInfoDTO.getCategoryId()); formOutputGoodsVO.setCategoryName(goodModelInfoDTO.getCategoryName()); formOutputGoodsVO.setGoodsName(goodModelInfoDTO.getBaseGoodsModelsName()); } List<GoodsModelVO> goodsModelList = Lists.newArrayList(); for (GoodModelInfoDTO goodModelInfo : goodModelInfoDTOS) { GoodsModelVO goodsModelVO = new GoodsModelVO(); goodsModelVO.setId(goodModelInfo.getId()); goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName()); goodsModelVO.setUnit(goodModelInfo.getUnit()); goodsModelVO.setCounts(goodModelInfo.getCounts()); goodsModelVO.setTotalAmount(goodModelInfo.getTotalAmount()); goodsModelList.add(goodsModelVO); } formOutputGoodsVO.setModels(goodsModelList); return formOutputGoodsVO; } @ApiOperation(value = "查询出库单详情明细", notes = "查询出库单详情明细") @ApiImplicitParam(name = "formOutputQry", value = "出库单详情查询条件", required = true, dataType = "LWhFormOutputQry", paramType = "query") consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -34,7 +34,7 @@ import com.consum.base.pojo.response.LWhFormProcureExtendVO; import com.consum.base.pojo.response.LWhFormProcureGoodsVO; import com.consum.base.service.BaseGoodsTemplateService; import com.consum.base.service.LWhFormProcureCoreService; import com.consum.base.service.impl.LWhFormProcureCoreService; import com.consum.base.service.LWhFormProcureGoodsService; import com.consum.base.service.LWhFormProcureService; import com.consum.base.service.LWhProcureModelService; consum-base/src/main/java/com/consum/base/core/AgencyEntity.java
File was deleted consum-base/src/main/java/com/consum/base/core/AgencyService.java
File was deleted consum-base/src/main/java/com/consum/base/core/CodeTemplateService.java
File was deleted consum-base/src/main/java/com/consum/base/core/GoodsService.java
File was deleted consum-base/src/main/java/com/consum/base/core/UnifyBusinessService.java
File was deleted consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
File was deleted consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
File was deleted consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
File was deleted consum-base/src/main/java/com/consum/base/core/data/Base_CategoryService.java
File was deleted consum-base/src/main/java/com/consum/base/core/po/SYS_AGENCY.java
File was deleted consum-base/src/main/java/com/consum/base/core/po/WhFormInventory.java
File was deleted consum-base/src/main/java/com/consum/base/core/po/WhFormProcure.java
File was deleted consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java
File was deleted consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java
File was deleted consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java
File was deleted consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java
@@ -3,130 +3,7 @@ import java.util.List; public class FinSysServerVo { // // 主键 // private Long id = null; // // 属性列表 // // private Long createTime = null; // private Long createdTime = null; // // private String createUser = null; // private String createdBy = null; // private String name = null; // private String code = null; // //private Integer level = null; // private Integer lvType=null; // private Long lv = null; // private Long status = null; // private Long delFlag = null; // private Long parentId = null; // private List<FinSysServerVo> children=null; // // public FinSysServerVo() { // } // // public Long getId() { // return id; // } // // public void setId(Long id) { // this.id = id; // } // // public Long getCreatedTime() { // return createdTime; // } // // public void setCreatedTime(Long createdTime) { // this.createdTime = createdTime; // } // // public String getCreatedBy() { // return createdBy; // } // // public void setCreatedBy(String createdBy) { // this.createdBy = createdBy; // } // // public String getName() { // return name; // } // // public void setName(String name) { // this.name = name; // } // // public String getCode() { // return code; // } // // public void setCode(String code) { // this.code = code; // } // // public Integer getLvType() { // return lvType; // } // // public void setLvType(Integer lvType) { // this.lvType = lvType; // } // // public Long getLv() { // return lv; // } // // public void setLv(Long lv) { // this.lv = lv; // } // // public Long getStatus() { // return status; // } // // public void setStatus(Long status) { // this.status = status; // } // // public Long getDelFlag() { // return delFlag; // } // // public void setDelFlag(Long delFlag) { // this.delFlag = delFlag; // } // // public Long getParentId() { // return parentId; // } // // public void setParentId(Long parentId) { // this.parentId = parentId; // } // // public List<FinSysServerVo> getChildren() { // return children; // } // // public void setChildren(List<FinSysServerVo> children) { // this.children = children; // } // // @Override // public String toString() { // return "FinSysCategoryVo{" + // "id=" + id + // ", createdTime=" + createdTime + // ", createdBy='" + createdBy + '\'' + // ", name='" + name + '\'' + // ", code='" + code + '\'' + // ", lvType=" + lvType + // ", lv=" + lv + // ", status=" + status + // ", delFlag=" + delFlag + // ", parentId=" + parentId + // ", children=" + children + // '}'; // } private Long id; private String label; private Long parentId; @@ -139,8 +16,7 @@ this.children = children; } public FinSysServerVo() { } public FinSysServerVo() {} public Long getId() { return id; consum-base/src/main/java/com/consum/base/pojo/ImportUserParam.java
New file @@ -0,0 +1,31 @@ package com.consum.base.pojo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; /** * @author asus * @version 1.0 * @description: 导入用户参数 * @date 2023/12/6 11:00 */ @Data public class ImportUserParam { @ExcelProperty("用户姓名") private String userName; @ExcelProperty("用户编号") private String userCode; @ExcelProperty("手机号") private String userPhone; @ExcelProperty("性别(1男，2女)") private Integer sex; @ExcelProperty("电子邮箱") private String email; @ExcelProperty("顺序号") private Long seq; @ExcelProperty("角色名称") private String roleName; } consum-base/src/main/java/com/consum/base/pojo/LWhFormInventoryVo.java
File was deleted consum-base/src/main/java/com/consum/base/pojo/UpdatePwdParam.java
File was deleted consum-base/src/main/java/com/consum/base/pojo/dto/GoodModelInfoDTO.java
New file @@ -0,0 +1,23 @@ package com.consum.base.pojo.dto; import lombok.Data; /** * @author asus * @version 1.0 * @description: 物品型号转换 * @date 2023/12/6 10:12 */ @Data public class GoodModelInfoDTO { private Long id; private Long categoryId; private String categoryName; private Long baseGoodsTemplateId; private String baseGoodsName; private String baseGoodsModelsName; private String unit; private Integer counts; private Integer totalAmount; } consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java
File was deleted consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java
File was deleted consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java
@@ -1,5 +1,7 @@ package com.consum.base.pojo.query; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +14,7 @@ */ @Data @ApiModel @JsonIgnoreProperties(ignoreUnknown = true) public class UsingFormBackQry { @ApiModelProperty(value = "主键") consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java
@@ -1,8 +1,11 @@ package com.consum.base.pojo.request; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,6 +18,7 @@ @NoArgsConstructor @Data @ApiModel @JsonIgnoreProperties(ignoreUnknown = true) public class UsingFormBackParam { @ApiModelProperty(value = "物品退回部门id") @@ -36,10 +40,5 @@ @ApiModelProperty(value = "分发物品信息") private List<UsingFormBackGoodsInfo> goods; } consum-base/src/main/java/com/consum/base/pojo/response/FromProcureTemplateInfoVO.java
File was deleted consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
@@ -1,6 +1,8 @@ package com.consum.base.pojo.response; import java.util.List; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,15 +14,20 @@ @Data public class GoodsModelVO { @ApiModelProperty(value = "id") private Long id; @ApiModelProperty(value = "型号名称") private String baseGoodsModelsName; @ApiModelProperty(value = "单位信息") private String unit; @ApiModelProperty(value = "单价") private Long price; @ApiModelProperty(value = "数量") private Integer counts; private Integer worehouseCount; private Long baseGoodsModelsId; @ApiModelProperty(value = "总金额") private Integer totalAmount; private String scrappedName;
@@ -1,5 +1,6 @@ package com.consum.base.service; import com.consum.base.pojo.dto.GoodModelInfoDTO; import java.util.List; import java.util.Map; @@ -31,4 +32,12 @@ * @return */ List<GoodsTemplateCountVO> getProcureCountByBusinessId(Long businessId); /** * 根据业务id查询型号信息列表 * * @param businessId * @return */ List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId); } consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
File was renamed from consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java @@ -1,4 +1,4 @@ package com.consum.base.service; package com.consum.base.service.impl; import java.util.ArrayList; import java.util.HashMap; @@ -17,6 +17,15 @@ import com.consum.base.core.CodeGeneratorService; import com.consum.base.core.WhBusinessEnum; import com.consum.base.core.utils.IdUtil; import com.consum.base.service.BaseGoodsTemplateService; import com.consum.base.service.BaseWarehouseService; import com.consum.base.service.LWhFormInventoryGoodsServiceImpl; import com.consum.base.service.LWhFormInventoryService; import com.consum.base.service.LWhFormOutputService; import com.consum.base.service.LWhFormProcureGoodsService; import com.consum.base.service.LWhFormProcureService; import com.consum.base.service.LWhGoodsService; import com.consum.base.service.LWhProcureModelService; import com.consum.model.po.BaseWarehouse; import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.LWhFormInventory; consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -2,7 +2,6 @@ import com.consum.base.service.BaseWarehouseService; import com.consum.base.service.FinSysTenantServiceImpl; import com.consum.base.service.LWhFormInventoryCoreService; import com.consum.base.service.LWhFormInventoryGoodsServiceImpl; import com.consum.base.service.LWhFormInventoryService; import com.consum.base.service.LWhGoodsService; consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
File was renamed from consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java @@ -1,6 +1,5 @@ package com.consum.base.service; package com.consum.base.service.impl; import com.consum.base.service.impl.LWhGoodsRecordDetailsService; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -18,6 +17,12 @@ import com.consum.base.core.service.LWhWarningCoreServiceImpl; import com.consum.base.core.utils.IdUtil; import com.consum.base.core.utils.LockManage; import com.consum.base.service.BaseGoodsTemplateService; import com.consum.base.service.LWarehouseFlowService; import com.consum.base.service.LWhFormOutputService; import com.consum.base.service.LWhGoodsRecordService; import com.consum.base.service.LWhGoodsService; import com.consum.base.service.LWhProcureModelService; import com.consum.model.po.LWarehouseFlow; import com.consum.model.po.LWhFormOutput; import com.consum.model.po.LWhFormTransfer; consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -28,7 +28,6 @@ import com.consum.base.pojo.query.LWhFormOutputQry; import com.consum.base.service.BaseGoodsModelsService; import com.consum.base.service.BaseWarehouseService; import com.consum.base.service.LWhFormOutputCoreService; import com.consum.base.service.LWhFormOutputService; import com.consum.base.service.LWhGoodsService; import com.consum.base.service.LWhProcureModelService; consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
File was renamed from consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java @@ -1,5 +1,8 @@ package com.consum.base.service; package com.consum.base.service.impl; import com.consum.base.service.LWarehouseFlowCoreService; import com.consum.base.service.LWhFormProcureService; import com.consum.base.service.LWhProcureModelService; import java.util.List; import java.util.stream.Collectors;
@@ -4,7 +4,6 @@ import com.consum.base.service.LGoodsUserRecordServiceImpl; import com.consum.base.service.LGoodsWhRecordServiceImpl; import com.consum.base.service.LWarehouseFlowService; import com.consum.base.service.LWhFormOutputCoreService; import com.consum.base.service.LWhFormTransferService; import com.consum.base.service.LWhGoodsRecordService; import com.consum.base.service.LWhGoodsService; consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java
@@ -10,6 +10,7 @@ import com.consum.base.core.WhBusinessEnum; import com.consum.base.core.utils.MapUtils; import com.consum.base.core.utils.MapperUtil; import com.consum.base.pojo.dto.GoodModelInfoDTO; import com.consum.base.pojo.response.GoodsTemplateCountVO; import com.consum.base.service.LWhProcureModelService; import com.consum.model.po.LWhProcureModel; @@ -137,4 +138,23 @@ } return goodsTemplateCount; } @Override public List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId) { // 查询型号列表信息 List<GoodModelInfoDTO> goodsModelList = Lists.newArrayList(); String sql = "SELECT bgt.id baseGoodsTemplateId,pm.id,CATEGORY_ID,CATEGORY_NAME,GOODS_NAME baseGoodsName,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount " + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID " + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID = :businessId"; Map<String, Object> paramMap = new HashMap<>(); paramMap.put("businessId", businessId); List<Map<String, Object>> modelList = select(sql, paramMap, new MapperUtil()); modelList.forEach(item -> { GoodModelInfoDTO goodsModelVO = MapUtils.convertMapToObj(item, GoodModelInfoDTO.class); goodsModelList.add(goodsModelVO); }); return goodsModelList; } } consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
@@ -1,17 +1,19 @@ package com.consum.model.po; import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.walker.jdbc.BasePo; import java.util.List; /** * 表名:FIN_SYS_TENANT_USER * * * @author genrator */ @JsonIgnoreProperties(ignoreUnknown = true) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) public class FinSysTenantUser extends BasePo<FinSysTenantUser> { // 序列化版本号
