diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java index e717ae6..fd87950 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java @@ -35,6 +35,14 @@ public final class AnnualreviewTaskConstant { */ public static final Long APPROVE_FAIL = 2L; + /** + * 通用不限品类 + * @param status + * @return + */ + public static final String universalUnlimitedCategory="0"; + + /** * 获取状态名称 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java index 348e63f..2ef9867 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java @@ -50,6 +50,10 @@ public final class CoscoCategoryConstant { * 建库方式 offline.线下 */ public static final String BUILD_TYPE_OFFLINE = "offline"; + /** + * 供应商品类库类型 + */ + public static final String CATEGORY_TYPE_PRODUCT = "supplier_offline"; /** * 锁定类型(0.未锁定、1.锁定) */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java index 7dc599c..2188790 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java @@ -56,5 +56,9 @@ public class CoscoAnnualreviewTask extends BaseEntity{ private Date createTime; private Date updateTime; + /** + * 模板名称 + */ + private String templateName; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index fb9ae39..cabfb77 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java @@ -76,8 +76,8 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS vo.setStartTime(coscoAnnualreviewTask.getStartTime()); vo.setAnnualreviewYear(coscoAnnualreviewTask.getAnnualreviewYear()); vo.setEndTime(coscoAnnualreviewTask.getEndTime()); - vo.setTemplateName(coscoAnnualreviewTemplateMapper.selectCoscoAnnualreviewTemplateById(coscoAnnualreviewTask.getTemplateId()).getTemplateName()); - if(coscoAnnualreviewTask.getCategoryId()!=null){ + vo.setTemplateName(coscoAnnualreviewTask.getTemplateName()); + if(coscoAnnualreviewTask.getCategoryId()!=null && !AnnualreviewTaskConstant.universalUnlimitedCategory.equals(coscoAnnualreviewTask.getCategoryLimitation())){ vo.setCategoryName(organizationMapper.selectCategoryNameById(coscoAnnualreviewTask.getCategoryId())); } vo.setCategoryId(coscoAnnualreviewTask.getCategoryId()); @@ -285,7 +285,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS //获取查询任务部门信息 List deptIds = new ArrayList<>(); coscoAnnualreviewTaskListVoIPage.getRecords().forEach(ss -> { - ss.setCategoryName(organizationMapper.selectCategoryNameById(ss.getCategoryId())); + if(!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(ss.getCategoryLimitation())){ + ss.setCategoryName(organizationMapper.selectCategoryNameById(ss.getCategoryId())); + } OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(ss.getDeptId()); ss.setDeptName(orgDeptInfo.getOrgName()); }); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java index e42472b..93c4b5a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java @@ -8,9 +8,11 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskSupplierService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierListVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +31,8 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev private CoscoAnnualreviewTaskSupplierMapper coscoAnnualreviewTaskSupplierMapper; @Autowired private IOrgService orgService; + @Autowired + private CoscoCategoryMapper coscoCategoryMapper; /** * 查询供应商评价_年审任务关联供应商 @@ -111,6 +115,9 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo); //获取查询部门信息 TODO 待完善 annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> { + if(!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(vo.getCategoryLimitation())){ + vo.setCategoryName(coscoCategoryMapper.selectCategoryNameById(vo.getCategoryId())); + } SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId()); if(!ObjectUtil.isEmpty(orgInfo)){ vo.setDeptName(orgInfo.getOrgName()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java index 29c3465..d875b6d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java @@ -173,7 +173,9 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userVo1.getUserDeptId()); vo.setTenantName(orgDeptInfo.getOrgName()); } - vo.setCategoryName(coscoCategoryMapper.selectCategoryNameById(vo.getCategoryId())); + if(!AnnualreviewTaskConstant.universalUnlimitedCategory.equals(vo.getCategoryLimitation())){ + vo.setCategoryName(coscoCategoryMapper.selectCategoryNameById(vo.getCategoryId())); + } }); return annualreviewTaskSupplierUserVoIPage; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java index 761ca1c..c645ff0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java @@ -22,6 +22,10 @@ public class AnnualreviewTaskSupplierListVo implements Serializable { * 供应商名称 */ private String name; + /** + * 供应商类目id + */ + private String categoryId; /** * 供应商品类 */ @@ -49,6 +53,9 @@ public class AnnualreviewTaskSupplierListVo implements Serializable { private Date startTime; private Date endTime; + /** 品类限制类型（0.通用不限品类、1.限制品类） */ + private String categoryLimitation; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java index 0d7418a..924d942 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java @@ -97,4 +97,8 @@ public class AnnualreviewTaskSupplierUserVo implements Serializable { @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; + + + /** 品类限制类型（0.通用不限品类、1.限制品类） */ + private String categoryLimitation; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java index 433c733..4cd7d56 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java @@ -42,6 +42,9 @@ public class CoscoAnnualreviewTaskListVo implements Serializable { private String categoryName; + /** 品类限制类型（0.通用不限品类、1.限制品类） */ + private String categoryLimitation; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java index 5c89517..e69e039 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java @@ -81,7 +81,7 @@ public class CoscoCategoryLibraryController extends BaseController { @PostMapping public BaseResponse add(@RequestBody AddCoscoCategoryLibraryVo coscoCategoryLibrary) { if(coscoCategoryLibrary.getCategoryIds()==null || coscoCategoryLibrary.getCategoryIds().isEmpty()){ - BaseResponse.fail("请选择品类"); + return BaseResponse.fail("请选择品类"); } return BaseResponse.success(coscoCategoryLibraryService.insertCoscoCategoryLibrary(coscoCategoryLibrary)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java index 24f1bb9..93b2845 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java @@ -33,6 +33,10 @@ public class CoscoCategoryLibrarySupplierApply extends BaseEntity { /** 删除标识(normal.正常、deleted.已删除) */ private String delFlag= CoscoCategoryConstant.DELETE_FLAG_YES; + /** + * 建库方式(online.线上、offline.线下) + */ + private String approveType; private LocalDateTime createTime; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarAttachmentsService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarAttachmentsService.java new file mode 100644 index 0000000..fab3beb --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarAttachmentsService.java @@ -0,0 +1,16 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service; + +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; + +public interface ICoscoCategoryLibrarAttachmentsService { + + + /** + * 添加附件 + * @param coscoCategoryLibrarAttachments + */ + void addCoscoCategoryLibrarAttchments(CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments, + String LibraryId,String userId); + + CoscoCategoryLibrarAttachments selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(String id); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarAttachmentsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarAttachmentsServiceImpl.java new file mode 100644 index 0000000..f4563cf --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarAttachmentsServiceImpl.java @@ -0,0 +1,41 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl; + +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarAttachmentsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; + +@Service +public class CoscoCategoryLibrarAttachmentsServiceImpl implements ICoscoCategoryLibrarAttachmentsService { + + @Autowired + private CoscoCategoryLibrarAttachmentsMapper coscoCategoryLibrarAttachmentsMapper; + + + @Override + public void addCoscoCategoryLibrarAttchments(CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments, + String LibraryId, String userId) { + coscoCategoryLibrarAttachments.setId(PropertyUtils.getSnowflakeId()); + coscoCategoryLibrarAttachments.setCategoryLibraryId(LibraryId); + coscoCategoryLibrarAttachments.setCreateTime(LocalDateTime.now()); + coscoCategoryLibrarAttachments.setCreateBy(userId); + coscoCategoryLibrarAttachments.setUpdateTime(LocalDateTime.now()); + coscoCategoryLibrarAttachmentsMapper.insertCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachments); + + } + + /** + * 根据id查询附件 + * + * @param id + * @return + */ + @Override + public CoscoCategoryLibrarAttachments selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(String id) { + return coscoCategoryLibrarAttachmentsMapper.selectCoscoCategoryLibrarAttachmentsById(id); + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index 4e45b2c..1d251fa 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -14,6 +14,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrary import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarAttachmentsService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; @@ -44,7 +45,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl 0) { sb.append(","); } - if(categoryName!=null){ + if (categoryName != null) { sb.append(categoryName); } } vo.setCategoryName(sb.toString()); - coscoCategoryLibrarAttachmentsMapper.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id); + vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id)); //获取添加品类 vo.setCategoryIds(coscoCategoryLibraryContainService.selectByLibraryId(id)); vo.setSuppliers(coscoCategoryLibrarySupplierApplyService.selectSupplierByLibraryId(id)); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java index 92dfe29..9abbbae 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java @@ -6,11 +6,14 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarAttachmentsService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierService; @@ -45,6 +48,8 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp private IOrgService orgService; @Autowired private IUserService userService; + @Autowired + private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService; /** * 查询品类库_品类库入库供应商申请单 @@ -64,9 +69,9 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp } sb.append(coscoCategoryMapper.selectCategoryNameById(s)); } + vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id)); vo.setCategoryName(sb.toString()); vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id)); - return vo; } @@ -96,6 +101,13 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp coscoCategoryLibrarySupplierApply.setCreateBy(currentUser.getUserId()); coscoCategoryLibrarySupplierApply.setUpdateBy(currentUser.getUserId()); coscoCategoryLibrarySupplierApply.setUpdateDate(LocalDateTime.now()); + if (CoscoCategoryConstant.BUILD_TYPE_OFFLINE + .equals(coscoCategoryLibrarySupplierApply.getApproveType())) { + coscoCategoryLibrarySupplierApply.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_PASS); + CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments = coscoCategoryLibrarySupplierApply.getCoscoCategoryLibrarAttachments(); + coscoCategoryLibrarAttachments.setAttachmentsType(CoscoCategoryConstant.CATEGORY_TYPE_PRODUCT); + coscoCategoryLibrarAttachmentsService.addCoscoCategoryLibrarAttchments(coscoCategoryLibrarAttachments, coscoCategoryLibrarySupplierApply.getCategoryLibraryId(), currentUser.getUserId()); + } coscoCategoryLibrarySupplierApplyMapper.insertCoscoCategoryLibrarySupplierApply(coscoCategoryLibrarySupplierApply); coscoCategoryLibrarySupplierService.saveSupplierIds(coscoCategoryLibrarySupplierApply.getId(), coscoCategoryLibrarySupplierApply.getCategoryLibraryId(), coscoCategoryLibrarySupplierApply.getSupplierIds()); return 1; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibrarySupplierApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibrarySupplierApplyVo.java index 835385b..504b303 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibrarySupplierApplyVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibrarySupplierApplyVo.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; import lombok.Data; @@ -15,4 +16,8 @@ public class AddCoscoCategoryLibrarySupplierApplyVo extends CoscoCategoryLibrary */ private List supplierIds; + /** + * 附件信息 + */ + private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java index 410cf0a..0463913 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java @@ -1,6 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -67,5 +68,9 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable { private BasePageRequest basePageRequest; private List coscoCategoryLibrarySupplierVos; + /** + * 附件信息 + */ + private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments; } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml index 21bd790..06af709 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml @@ -22,6 +22,7 @@ + @@ -89,8 +90,26 @@