修改品类数据
This commit is contained in:
@ -29,5 +29,7 @@ public class CoscoCategoryLibraryContain extends BaseEntity {
|
|||||||
|
|
||||||
private String categoryName;
|
private String categoryName;
|
||||||
|
|
||||||
|
private String categoryType;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -106,6 +106,8 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
|
|||||||
coscoCategoryLibraryContain.setCategoryLibraryId(id);
|
coscoCategoryLibraryContain.setCategoryLibraryId(id);
|
||||||
coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
|
coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
|
||||||
coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
|
coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
|
||||||
|
coscoCategoryLibraryContain.setCategoryName(categoryId.getCategoryName());
|
||||||
|
coscoCategoryLibraryContain.setCategoryType(categoryId.getCategoryType());
|
||||||
coscoCategoryLibraryContain.setDeptId(TokenUtil.getCurrentUser().getOrganizationId());
|
coscoCategoryLibraryContain.setDeptId(TokenUtil.getCurrentUser().getOrganizationId());
|
||||||
list.add(coscoCategoryLibraryContain);
|
list.add(coscoCategoryLibraryContain);
|
||||||
}
|
}
|
||||||
|
@ -42,8 +42,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
|
|||||||
private ICoscoCategoryLibrarySupplierApplyService coscoCategoryLibrarySupplierApplyService;
|
private ICoscoCategoryLibrarySupplierApplyService coscoCategoryLibrarySupplierApplyService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService;
|
private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService;
|
||||||
@Autowired
|
|
||||||
private ICoscoCategoryService coscoCategoryService;
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IUserService userService;
|
private IUserService userService;
|
||||||
@Autowired
|
@Autowired
|
||||||
@ -206,6 +205,8 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
|
|||||||
sb.append(s);
|
sb.append(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibrary.getApplyDeptId());
|
||||||
|
vo.setDeptName(orgDeptInfo.getDeptName());
|
||||||
vo.setCategoryName(sb.toString());
|
vo.setCategoryName(sb.toString());
|
||||||
vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));
|
vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));
|
||||||
//获取添加品类
|
//获取添加品类
|
||||||
|
@ -71,6 +71,8 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
|
|||||||
}
|
}
|
||||||
sb.append(s);
|
sb.append(s);
|
||||||
}
|
}
|
||||||
|
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId());
|
||||||
|
vo.setDeptName(orgDeptInfo.getDeptName());
|
||||||
vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));
|
vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));
|
||||||
vo.setCategoryName(sb.toString());
|
vo.setCategoryName(sb.toString());
|
||||||
vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id));
|
vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id));
|
||||||
|
@ -223,7 +223,7 @@
|
|||||||
SELECT
|
SELECT
|
||||||
ccl.id,
|
ccl.id,
|
||||||
ccl.name,
|
ccl.name,
|
||||||
GROUP_CONCAT(case when cclc.category_type=0 then DISTINCT cclc.category_name SEPARATOR ', ' end) AS categoryNames,
|
GROUP_CONCAT(DISTINCT CASE WHEN cclc.category_type = 0 THEN cclc.category_name ELSE NULL END SEPARATOR ', ') AS categoryNames,
|
||||||
ccl.create_by,
|
ccl.create_by,
|
||||||
ccl.apply_dept_id,
|
ccl.apply_dept_id,
|
||||||
ccl.term_of_validity AS termOfValidity,
|
ccl.term_of_validity AS termOfValidity,
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
ccl.name,
|
ccl.name,
|
||||||
ccl.area,
|
ccl.area,
|
||||||
ccl.id as libraryId,
|
ccl.id as libraryId,
|
||||||
'张三' as applyUser,
|
ccl.dept_id as deptId,
|
||||||
ccl.create_time as applyTime,
|
ccl.create_time as applyTime,
|
||||||
cclsa.approve_status as approveStatus
|
cclsa.approve_status as approveStatus
|
||||||
from cosco_category_library_supplier_apply cclsa
|
from cosco_category_library_supplier_apply cclsa
|
||||||
@ -176,7 +176,12 @@
|
|||||||
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
|
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
|
||||||
select csb.name as name,
|
select csb.name as name,
|
||||||
csb.enterprise_type as area,
|
csb.enterprise_type as area,
|
||||||
csb.social_credit_code as unifiedSocialCreditCode,
|
CASE
|
||||||
|
WHEN csb.supplier_type = 'dvs' THEN social_credit_code
|
||||||
|
WHEN csb.supplier_type = 'ovs' THEN vat
|
||||||
|
WHEN csb.supplier_type = 'pe' THEN id_card
|
||||||
|
ELSE NULL
|
||||||
|
END AS unifiedSocialCreditCode,
|
||||||
csb.supplier_type as supplierCategory,
|
csb.supplier_type as supplierCategory,
|
||||||
csb.id
|
csb.id
|
||||||
from cosco_category_library_supplier_apply cclsa
|
from cosco_category_library_supplier_apply cclsa
|
||||||
|
Reference in New Issue
Block a user