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-06-25 09:42:12 +08:00
parent 448e29a5db
commit b3e08a05d3
12 changed files with 152 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java
View File

@ -1,7 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -14,30 +16,23 @@ import java.util.List;
public class UserController {
@Autowired
private UserService userService;
@GetMapping("/getUserList")
public BaseResponse getUserList() {
return BaseResponse.success(getUser());
return BaseResponse.success(userService.getUser());
}
private List<UserVo> getUser() {
List<UserVo> userList = new ArrayList<>();
for (int i = 1; i <= 10; i++) {
UserVo user = new UserVo();
user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010
user.setUserName("用户" + i);
user.setUserDept("部门" + ((i % 3) + 1)); // 部门1、部门2、部门3轮换
user.setUserDeptId("D" + ((i % 3) + 1)); // D1、D2、D3轮换
userList.add(user);
}
return userList;
@GetMapping("/getDeptList")
public BaseResponse getDeptList() {
return BaseResponse.success(userService.getDept());
}
}

38
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java Normal file
View File

@ -0,0 +1,38 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class UserService {
public List<UserVo> getDept() {
List<UserVo> deptList = new ArrayList<>();
for (int i = 1; i <= 10; i++) {
UserVo dept = new UserVo();
dept.setUserDeptId("D" + String.format("%03d", i));
dept.setUserDept("部门" + i);
deptList.add(dept);
}
return deptList;
}
public List<UserVo> getUser() {
List<UserVo> userList = new ArrayList<>();
for (int i = 1; i <= 10; i++) {
UserVo user = new UserVo();
user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010
user.setUserName("用户" + i);
user.setUserDept("部门" + ((i % 3) + 1)); // 部门1、部门2、部门3轮换
user.setUserDeptId("D" + ((i % 3) + 1)); // D1、D2、D3轮换
userList.add(user);
}
return userList;
}
}

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

@ -105,7 +105,21 @@ public class CoscoCategoryLibraryController extends BaseController {
*/
@PostMapping("/approval")
public BaseResponse approval(@RequestBody CoscoCategoryVO coscoCategoryVO) {
CoscoCategoryLibrary coscoCategoryLibrary = coscoCategoryLibraryService.selectCoscoCategoryLibraryById(coscoCategoryVO.getId());
if(coscoCategoryLibrary.getDeptId()==null){
throw new RuntimeException("请选择负责部门");
}
return BaseResponse.success(coscoCategoryLibraryService.approval(coscoCategoryVO));
}
/**
* 锁定列表查询
* @param
* @return
*/
@GetMapping("/superiorLockList")
public BaseResponse superiorLockList() {
return BaseResponse.success(coscoCategoryLibraryService.superiorLockList());
}
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java
View File

@ -62,4 +62,11 @@ public interface CoscoCategoryLibraryContainMapper extends IBaseMapper<CoscoCate
public int deleteCoscoCategoryLibraryContainByCategoryLibraryIds(String[] categoryLibraryIds);
public int batchCoscoCategoryLibraryContain(List<CoscoCategoryLibraryContain> list);
/**
* 获取上级部门锁定品类信息
* @param deptIds
* @return
*/
List<String> selectLoctyList(List<String> deptIds);
}

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml
View File

@ -67,4 +67,20 @@
#{categoryLibraryId}
</foreach>
</update>
<select id="selectLoctyList" parameterType="list" resultType="string">
select cclc.category_id from cosco_category_library_contain cclc
join cosco_category_library ccl on cclc.category_library_id=ccl.id
<where>
<if test="list!=null and list.size>0">
and cclc.dept_id in
<foreach item="item" collection="list" separator="," open="(" close=")">
#{item}
</foreach>
</if>
and cclc.lock_type=1
and ccl.approve_status=1
</where>
</select>
</mapper>

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
View File

@ -209,7 +209,7 @@
SELECT
ccl.id,
ccl.name,
GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryNames,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
ccl.area,
"集团" AS deptName,
"张三" AS createName,

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java
View File

@ -75,4 +75,10 @@ public interface ICoscoCategoryLibraryContainService extends IBaseService<Cosco
* @return
*/
List<AddCategoryIdVos> selectByLibraryId(String id);
/**
* 锁定列表查询
* @return
*/
List<String> selectLoctyList();
}

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryService.java
View File

@ -90,5 +90,17 @@ public interface ICoscoCategoryLibraryService extends IBaseService<CoscoCategor
*/
Object approval(CoscoCategoryVO coscoCategoryVO);
/**
* 返回值
* @param coscoCategoryLibrary
* @return
*/
int synchronousCategroyLibraryApproval(CoscoCategoryLibrary coscoCategoryLibrary);
/**
* 锁定列表查询
* @param
* @return
*/
List<String> superiorLockList();
}

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
View File

@ -126,4 +126,15 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
}
return categoryIds;
}
/**
* 获取锁定的品类信息
* @return
*/
@Override
public List<String> selectLoctyList() {
List<String> deptIds=new ArrayList<>();
deptIds.add("dep01");
return coscoCategoryLibraryContainMapper.selectLoctyList(deptIds);
}
}

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

@ -225,4 +225,9 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
coscoCategoryLibrary1.setRemark(coscoCategoryLibrary.getRemark());
return coscoCategoryLibraryMapper.updateCoscoCategoryLibrary(coscoCategoryLibrary1);
}
@Override
public List<String> superiorLockList() {
return coscoCategoryLibraryContainService.selectLoctyList();
}
}

29
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
View File

@ -4,12 +4,15 @@ import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.impl.UserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
@ -37,6 +40,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
@Autowired
private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper;
@Autowired
private UserService userService;
@Autowired
private ICoscoEvaluateTemplateIndicatorNdService coscoEvaluateTemplateIndicatorNdService;
@Autowired
private CoscoEvaluateTaskSupplierMapper coscoEvaluateTaskSupplierMapper;
@ -102,6 +107,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
vo.setUserIds(new ArrayList<>(userIds));
list.add(vo);
});
addCoscoEvaluateTaskVo.setUserList(getUserList(coscoEvaluateTaskSupplierUsers));
addCoscoEvaluateTaskVo.setSupplierIds(list);
List<UserNdTypeVo> userNdTypeVos = coscoEvaluateTaskSupplierUserMapper.selectUserNdTypeList(id);
Map<String, List<UserNdTypeVo>> map = userNdTypeVos.stream()
@ -122,11 +128,29 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos);
addCoscoEvaluateTaskVo.setIndicatorList(vos);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
return addCoscoEvaluateTaskVo;
}
private List<UserVo> getUserList(List<CoscoEvaluateTaskSupplierUser> coscoEvaluateTaskSupplierUsers) {
List<UserVo> user = userService.getUser();
Map<String, UserVo> map = user.stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
Map<String, CoscoEvaluateTaskSupplierUser> suUser = coscoEvaluateTaskSupplierUsers.stream()
.collect(Collectors.toMap(
CoscoEvaluateTaskSupplierUser::getUserId,
Function.identity(),
(existing, replacement) -> existing // 或者选择 replacement，决定保留哪个值
));
Map<String, UserVo> userMap = new HashMap<>();
suUser.keySet().forEach(usa -> {
userMap.put(usa, map.get(usa));
});
return userMap.values().stream().collect(Collectors.toList());
}
/**
* 查询【供应商评价_评价任务主表】列表
*
@ -208,7 +232,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
IPage<CoscoEvaluateTaskListVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
taskListVo.getBasePageRequest().getPageSize());
IPage<TaskPageVo> taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
List<String> deptIds=new ArrayList<>();
List<String> deptIds = new ArrayList<>();
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
deptIds.add(taskPageVo.getDeptId());
});
@ -223,6 +247,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
/**
* 任务提交
*
* @param addCoscoEvaluateTaskVo
* @return
*/
@ -243,7 +268,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
coscoEvaluateTask.setApproveStatus(vo.getApproveStatus());
coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask);
ApproveVo aVo=new ApproveVo();
ApproveVo aVo = new ApproveVo();
aVo.setResult(vo.getApproveStatus());
aVo.setCreateBy(coscoEvaluateTask.getCreateBy());
aVo.setDeptName("创建部门");

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddCoscoEvaluateTaskVo.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskDeptWeight;
@ -38,4 +39,9 @@ public class AddCoscoEvaluateTaskVo extends CoscoEvaluateTask {
*/
private List<CoscoEvaluateTaskDeptWeight> taskDeptWeightList;
/**
* 用户信息列表
*/
private List<UserVo> userList;
}