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-16 16:23:19 +08:00
parent e9985ab668
commit c524f0065c
14 changed files with 79 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java Normal file
View File

@ -0,0 +1,12 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public class TaskSelectConstant {
/**
* 创建人 create
*/
public static final String CREATE = "create";
/**
* 用户 user
*/
public static final String USER = "user";
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
View File

@ -37,13 +37,17 @@ public class OrgServiceImpl implements IOrgService {
*/
@Override
public SysOrg getOrgInfo(String id) {
return systemClient.getOrgInfo(id).getData();
BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(id);
if(!ObjectUtils.isEmpty(orgInfo.getData())){
return orgInfo.getData();
}
return null;
}
@Override
public OrgDeptVo getOrgDeptInfo(String id) {
OrgDeptVo orgDeptVo = new OrgDeptVo();
SysOrg dept = systemClient.getOrgInfo(id).getData();
SysOrg dept = getOrgInfo(id);
if(!ObjectUtils.isEmpty(dept)){
SysOrg org = systemClient.getOrgInfo(dept.getUpOrgId()).getData();
if(!ObjectUtils.isEmpty(org)){

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo;
@ -34,6 +35,7 @@ public class CoscoAnnualreviewTaskController extends BaseController {
@PostMapping("/getPage")
public BaseResponse<IPage<CoscoAnnualreviewTaskListVo>> getPage(@ApiParam(value = "对象数据", required = true)
@RequestBody CoscoAnnualreviewTaskListVo taskListVo) {
taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
return BaseResponse.success(coscoAnnualreviewTaskService.getPage(taskListVo));
}

17
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplierUser;
@ -10,6 +11,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnual
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.*;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -29,7 +31,6 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
private ICoscoAnnualreviewTaskSupplierUserService coscoAnnualreviewTaskSupplierUserService;
/**
* 获取供应商评价_年审任务供应商对应评审人详细信息
*/
@ -57,7 +58,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
/**
* 删除供应商评价_年审任务供应商对应评审人
*/
@DeleteMapping("/{ids}")
@DeleteMapping("/{ids}")
public BaseResponse<Integer> remove(@PathVariable String[] ids) {
return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.deleteCoscoAnnualreviewTaskSupplierUserByIds(ids));
}
@ -71,7 +72,11 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
@ApiOperation("查询分页数据")
@PostMapping("/getPage")
public BaseResponse<IPage<AnnualreviewTaskSupplierUserVo>> getPage(@ApiParam(value = "对象数据", required = true)
@RequestBody AnnualreviewTaskSupplierUserVo userVo) {
@RequestBody AnnualreviewTaskSupplierUserVo userVo) {
//如果为按供应商查询年度审核走以下逻辑，根据任务id进行判断
if (StringUtils.isEmpty(userVo.getAnnualreviewTaskId())) {
userVo.setUserId(TokenUtil.getCurrentUser().getUserId());
}
return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.getPage(userVo));
}
@ -80,12 +85,12 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
*/
@PostMapping("/addScore")
public BaseResponse addScore(@RequestBody AnnualAddScoreVo vo) {
CoscoAnnualreviewTaskSupplierUser user= coscoAnnualreviewTaskSupplierUserService.selectCoscoById(vo.getId());
if(user.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)){
CoscoAnnualreviewTaskSupplierUser user = coscoAnnualreviewTaskSupplierUserService.selectCoscoById(vo.getId());
if (user.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)) {
return BaseResponse.fail("当前人员已经打分，无法修改");
}
List<AnnualTaskIndicatorVo> scoreVoList = vo.getScoreVoList();
if(scoreVoList.isEmpty()){
if (scoreVoList.isEmpty()) {
return BaseResponse.fail("请选择打分项");
}
coscoAnnualreviewTaskSupplierUserService.addScore(vo);

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

@ -36,6 +36,7 @@ public class CoscoAnnualreviewTaskListVo implements Serializable {
private String deptId;
private String createBy;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java
View File

@ -5,6 +5,7 @@ import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.TaskSelectConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
@ -38,6 +39,7 @@ public class CoscoEvaluateTaskController extends BaseController {
@PostMapping("/getPage")
public BaseResponse<IPage<CoscoEvaluateTaskListVo>> getPage(@ApiParam(value = "对象数据", required = true)
@RequestBody CoscoEvaluateTaskListVo taskListVo) {
taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
return BaseResponse.success(coscoEvaluateTaskService.getPage(taskListVo));
}
@ -47,6 +49,11 @@ public class CoscoEvaluateTaskController extends BaseController {
@PostMapping("/getTaskPage")
public BaseResponse<IPage<TaskPageVo>> getTaskPage(@ApiParam(value = "对象数据", required = true)
@RequestBody TaskPageVo taskListVo) {
if(taskListVo.getSelectBy().equals(TaskSelectConstant.CREATE)){
taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
}else if(taskListVo.getSelectBy().equals(TaskSelectConstant.USER)){
taskListVo.setUserId(TokenUtil.getCurrentUser().getUserId());
}
return BaseResponse.success(coscoEvaluateTaskService.getTaskPage(taskListVo));
}

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java
View File

@ -4,11 +4,13 @@ import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.alibaba.excel.EasyExcelFactory;
@ -120,6 +122,10 @@ public class CoscoEvaluateTaskSupplierController extends BaseController {
*/
@PostMapping("/getSupplierDimension")
public BaseResponse<IPage<SupplierDimensionVo>> getSupplierDimension(@RequestBody SupplierDimensionVo vo) {
//如果为按供应商查询评价任务走以下逻辑，根据任务id进行判断
if(StringUtils.isEmpty(vo.getTaskId())){
vo.setUserId(TokenUtil.getCurrentUser().getUserId());
}
return BaseResponse.success(coscoEvaluateTaskSupplierService.getSupplierDimension(vo));
}
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
View File

@ -79,6 +79,10 @@ public class CoscoEvaluateTaskListVo implements Serializable {
private String division;
private List<String> taskIds;
/**
* 创建人id
*/
private String createBy;
@ApiModelProperty(value = "分页对象信息")

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
View File

@ -50,6 +50,14 @@ public class TaskPageVo implements Serializable {
* 用户id
*/
private String userId;
/**
* 创建人
*/
private String createBy;
/**
* 查询创建人还是用户 create 创建人， user 用户
*/
private String selectBy="create";
private String approveStatus;

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
View File

@ -400,12 +400,12 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
IPage<CoscoSupplierBase> page = new Page<>(supplierPageVo.getBasePageRequest().getPageNo(), supplierPageVo.getBasePageRequest().getPageSize());
IPage<SupplierPageVo> supplierPage = coscoSupplierBaseMapper.getSupplierPage(page, supplierPageVo);
supplierPage.getRecords().forEach(vo -> {
SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId());
if (orgInfo != null) {
vo.setDeptName(orgInfo.getOrgName());
if(vo.getDeptId()!=null){
SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId());
if (orgInfo != null) {
vo.setDeptName(orgInfo.getOrgName());
}
}
});
return supplierPage;
}

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
View File

@ -8,7 +8,7 @@ import java.util.Date;
import java.util.List;
@Data
public class SupplierPageVo {
public class SupplierPageVo {
/**
* 供应商ID
@ -92,4 +92,8 @@ public class SupplierPageVo {
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
/**
* 品类集合
*/
private String categoryIds;
}

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

@ -237,6 +237,9 @@
<if test="vo.status != null ">
and cat.status = #{vo.status}
</if>
<if test="vo.createBy != null and vo.createBy!=''">
and cat.create_by = #{vo.createBy}
</if>
</where>
order by cat.create_time desc
</select>

6
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
View File

@ -384,6 +384,9 @@
<if test="vo.status!=null">
and cet.status=#{vo.status}
</if>
<if test="vo.createBy!=null and vo.createBy!=null">
and cet.create_by = #{vo.createBy}
</if>
<if test="vo.startTime!=null and vo.endTime!=null">
and cet.start_time between #{vo.startTime} and #{vo.endTime}
</if>
@ -417,6 +420,9 @@
<if test="vo.evaluateTheme!=null and vo.evaluateTheme!=''">
and cet.evaluate_theme like concat('%',#{vo.evaluateTheme},'%')
</if>
<if test="vo.createBy!=null and vo.createBy!=''">
and cet.create_by = #{vo.createBy}
</if>
<if test="vo.status!=null">
and cet.status=#{vo.status}
</if>

4
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
View File

@ -836,7 +836,8 @@
END AS unifiedCode,
GROUP_CONCAT(caw.dept_id) as dept_id,
max(caw.update_time) AS admissionTime,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName,
GROUP_CONCAT(DISTINCT cc.id SEPARATOR ', ') AS categoryIds
from
cosco_access_supplier_category as casc
join cosco_supplier_base as csb on casc.supplier_id = csb.id -- 供应商已准入品类
@ -860,6 +861,7 @@
</if>
)
and csb.access_status=1
and casc.del_flag='normal'
<if test="vo.name!=null and vo.name!=''">
and csb.name like concat('%',#{vo.name},'%')
</if>