liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改新添加逻辑

Browse Source
This commit is contained in:
YY
2025-07-17 10:11:40 +08:00
parent ffcb1db56c
commit 6a4ae4582e
20 changed files with 162 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java
View File

@ -35,6 +35,14 @@ public final class AnnualreviewTaskConstant {
*/
public static final Long APPROVE_FAIL = 2L;
/**
* 通用不限品类
* @param status
* @return
*/
public static final String universalUnlimitedCategory="0";
/**
* 获取状态名称
*

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
View File

@ -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.锁定)
*/

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java
View File

@ -56,5 +56,9 @@ public class CoscoAnnualreviewTask extends BaseEntity{
private Date createTime;
private Date updateTime;
/**
* 模板名称
*/
private String templateName;
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java
View File

@ -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<String> 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());
});

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java
View File

@ -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());

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java
View File

@ -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;
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java
View File

@ -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;

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java
View File

@ -97,4 +97,8 @@ public class AnnualreviewTaskSupplierUserVo implements Serializable {
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
/** 品类限制类型（0.通用不限品类、1.限制品类） */
private String categoryLimitation;
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
View File

@ -42,6 +42,9 @@ public class CoscoAnnualreviewTaskListVo implements Serializable {
private String categoryName;
/** 品类限制类型（0.通用不限品类、1.限制品类） */
private String categoryLimitation;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java
View File

@ -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));
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java
View File

@ -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;

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarAttachmentsService.java Normal file
View File

@ -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);
}

41
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarAttachmentsServiceImpl.java Normal file
View File

@ -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);
}
}

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
View File

@ -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<CoscoCatego
@Autowired
private ICoscoCategoryLibrarySupplierApplyService coscoCategoryLibrarySupplierApplyService;
@Autowired
private CoscoCategoryLibrarAttachmentsMapper coscoCategoryLibrarAttachmentsMapper;
private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService;
@Autowired
private CoscoCategoryMapper coscoCategoryMapper;
@Autowired
@ -93,12 +94,8 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
if (coscoCategoryLibrary.getApproveType().equals(CoscoCategoryConstant.BUILD_TYPE_OFFLINE)) {
coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_PASS);
CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments = coscoCategoryLibrary.getCoscoCategoryLibrarAttachments();
coscoCategoryLibrarAttachments.setId(PropertyUtils.getSnowflakeId());
coscoCategoryLibrarAttachments.setCategoryLibraryId(coscoCategoryLibrary.getId());
coscoCategoryLibrarAttachments.setCreateTime(LocalDateTime.now());
coscoCategoryLibrarAttachments.setCreateBy(currentUser.getUserId());
coscoCategoryLibrarAttachments.setUpdateTime(LocalDateTime.now());
coscoCategoryLibrarAttachmentsMapper.insertCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachments);
coscoCategoryLibrarAttachments.setAttachmentsType(CoscoCategoryConstant.BUILD_TYPE_OFFLINE);
coscoCategoryLibrarAttachmentsService.addCoscoCategoryLibrarAttchments(coscoCategoryLibrarAttachments, coscoCategoryLibrary.getId(), currentUser.getUserId());
} else {
coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
}
@ -198,12 +195,12 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
if (sb.length() > 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));

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java
View File

@ -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;

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibrarySupplierApplyVo.java
View File

@ -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<String> supplierIds;
/**
* 附件信息
*/
private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments;
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java
View File

@ -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<CoscoCategoryLibrarySupplierVo> coscoCategoryLibrarySupplierVos;
/**
* 附件信息
*/
private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments;
}

24
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
View File

@ -22,6 +22,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<result property="templateName" column="template_name"/>
</resultMap>
<sql id="selectCoscoAnnualreviewTaskVo">
@ -89,8 +90,26 @@
<select id="selectCoscoAnnualreviewTaskById" parameterType="String"
resultMap="CoscoAnnualreviewTaskResult">
<include refid="selectCoscoAnnualreviewTaskVo"/>
where id = #{id}
select cat.id,
cat.annualreview_theme,
cat.dept_id,
cat.annualreview_year,
cat.start_time,
cat.end_time,
cat.template_id,
cat.category_limitation,
cat.category_id,
cat.status,
cat.del_flag,
cat.create_by,
cat.create_time,
cat.update_by,
cat.update_time,
cate.template_name,
cat.last_update_time
from cosco_annualreview_task cat
left join cosco_annualreview_template cate on cat.template_id = cate.id
where cat.id = #{id}
</select>
<insert id="insertCoscoAnnualreviewTask"
@ -218,6 +237,7 @@
cat.annualreview_theme AS annualreviewTheme,
cat.start_time startTime,
cat.end_time endTime,
cat.category_limitation AS categoryLimitation,
cat.category_id AS categoryId,
cat.`status`,
cat.dept_id AS deptId,

8
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
View File

@ -37,16 +37,14 @@
SELECT
csb.id supplierId,
csb.NAME,
cc.id as categoryId,
cats.annualreview_task_id as annualreviewTaskId,
'单位' as deptName,
cc.category_name as categoryName,
cat.dept_id as deptId,
cat.category_limitation as categoryLimitation,
cats.review_result,
case when cats.review_result=1 then '合格'
when cats.review_result=2 then '不合格' else '待审批' end as reviewResultName,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) AS categoryName from
cosco_access_supplier_category casc join cosco_category cc ON cc.id = casc.category_id where casc.del_flag =
'normal' and casc.supplier_id=csb.id) as category
when cats.review_result=2 then '不合格' else '待审批' end as reviewResultName
FROM
cosco_annualreview_task_supplier cats
join cosco_annualreview_task cat on cats.annualreview_task_id = cat.id

1
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
View File

@ -47,6 +47,7 @@
cat.dept_id as deptId,
cat.annualreview_theme as annualreviewTheme,
cat.category_id categoryId,
cat.category_limitation as categoryLimitation,
'单位' AS deptName,
cat.start_time startTime,
cat.end_time endTime,