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:
TL
2025-07-14 13:47:48 +08:00
parent e0f14aa4bf
commit 849bbe998b
18 changed files with 247 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java
View File

@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.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.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.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
import io.swagger.annotations.ApiOperation;
@ -33,6 +35,9 @@ public class CoscoAccessWorkCategoryController extends BaseController {
@ApiOperation("查询分页数据")
@PostMapping("/getPage")
public BaseResponse<IPage<CoscoAccessWork>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
data.setCreateBy(userId);
return BaseResponse.success(coscoAccessWorkCategoryService.getPage(data));
}

20
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
View File

@ -30,7 +30,7 @@ public class CoscoAccessWorkController extends BaseController {
/**
* 供应商准入管理列表&供应商准入评审列表
* 供应商准入管理列表
* @return 返回结果
*/
@ApiOperation("查询分页数据")
@ -39,10 +39,26 @@ public class CoscoAccessWorkController extends BaseController {
//判断当前登录人是否是组长
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
data.setUserId(userId);
data.setCreateBy(userId);
return BaseResponse.success(coscoAccessWorkService.getPage(data));
}
/**
* 供应商准入评审列表
* @return 返回结果
*/
@ApiOperation("查询分页数据")
@PostMapping("/getReviewPage")
public BaseResponse<IPage<CoscoAccessWork>> getUserReviewPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
//判断当前登录人是否是组长
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
data.setUserId(userId);
return BaseResponse.success(coscoAccessWorkService.selectCoscoAccessWorkUserReviewPage(data));
}
/**
* 供应商准入审批管理列表
* @return 返回结果

1
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java
View File

@ -286,7 +286,6 @@ public class CoscoSupplierBaseController extends BaseController {
@ApiOperation("查询数据")
@GetMapping("/{id}")
public BaseResponse<CoscoSupplierVo> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){
return BaseResponse.success(coscoSupplierBaseService.selectCoscoSupplierBaseById(id));
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java
View File

@ -48,7 +48,7 @@ public class CoscoSupplierChangeApplyController extends BaseController {
*/
@ApiOperation("查询数据")
@GetMapping("/supplierChangeApplyById/{id}")
public BaseResponse<CoscoSupplierDiffVo> supplierChangeApplyById(@ApiParam(value = "主键id", required = true) @PathVariable String id){
public BaseResponse<CoscoSupplierChangeApply> supplierChangeApplyById(@ApiParam(value = "主键id", required = true) @PathVariable String id){
return BaseResponse.success(coscoSupplierChangeApplyService.supplierChangeApplyById(id));
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java
View File

@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.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.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.coscosupplier.entity.CoscoAccessSupplierCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
@ -34,6 +36,9 @@ public class CoscoSupplierexitController extends BaseController {
@ApiOperation("查询分页数据")
@PostMapping("/getPage")
public BaseResponse<IPage<CoscoSupplierexit>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierexit data) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
data.setCreateBy(userId);
return BaseResponse.success(coscoSupplierexitService.getPage(data));
}

17
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java
View File

@ -14,9 +14,24 @@ import java.util.List;
*/
public interface CoscoAccessWorkMapper {
/**
* 供应商准入管理列表
* @param page
* @param vo
* @return
*/
IPage<CoscoAccessWork> selectPageList(IPage<CoscoAccessWork> page, @Param("vo") CoscoAccessWork vo);
/**
* 供应商准入评审列表
* @param page
* @param vo
* @return
*/
IPage<CoscoAccessWork> selectCoscoAccessWorkUserReviewPage(IPage<CoscoAccessWork> page, @Param("vo") CoscoAccessWork vo);
IPage<CoscoAccessWork> selectApproveList(CoscoAccessWork coscoAccessWork);
/**

1
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java
View File

@ -1,6 +1,5 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;

18
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java
View File

@ -1,18 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class CoscoSupplierDiffVo implements Serializable {
private static final long serialVersionUID = 1L;
//主体任务
private CoscoSupplierChangeApply coscoSupplierChangeApply;
//变更内容集合
private List<CoscoSupplierChangeHistory> coscoSupplierChangeHistoryList;
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java
View File

@ -25,6 +25,9 @@ public interface ICoscoAccessWorkService {
*/
IPage<CoscoAccessWork> getPage(CoscoAccessWork data);
IPage<CoscoAccessWork> selectCoscoAccessWorkUserReviewPage(CoscoAccessWork data);
IPage<CoscoAccessWork> getApprovePage(CoscoAccessWork data);

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java
View File

@ -2,8 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApplyVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierDiffVo;
/**
* 中远海运_供应商_供应商信息变更申请Service接口
@ -19,7 +17,7 @@ public interface ICoscoSupplierChangeApplyService {
public CoscoSupplierDiffVo supplierChangeApplyById(String id);
public CoscoSupplierChangeApply supplierChangeApplyById(String id);
public CoscoSupplierChangeApply selectById(String id);

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

@ -110,6 +110,14 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
return coscoAccessWorkMapper.selectPageList(page, data);
}
@Override
public IPage<CoscoAccessWork> selectCoscoAccessWorkUserReviewPage(CoscoAccessWork data) {
IPage<CoscoAccessWork> page = new Page<>(data.getPageNo(), data.getPageSize());
//只查询供应商准入
data.setApplyType(CoscoType.APPLY_TYPE_GYSZR);
return coscoAccessWorkMapper.selectCoscoAccessWorkUserReviewPage(page, data);
}
@Override
public IPage<CoscoAccessWork> getApprovePage(CoscoAccessWork data) {
// 创建分页对象（当前页，每页大小）
@ -477,7 +485,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
coscoAccessUser.setLastUpdateTime(date);
coscoAccessUserMapper.updateCoscoAccessUserByUserId(coscoAccessUser);
//查询组员待评审的还剩下几条
//查询当前任务下组员待评审的数据还剩下几条，如果所有组员都评审完，将主任务状态修改为结果汇总中，否则修改进行中
CoscoAccessUser coscoAccessUser2 = new CoscoAccessUser();
coscoAccessUser2.setAccessWorkId(vo.getAccessWorkId());
coscoAccessUser2.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D);

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

@ -106,8 +106,11 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
public IPage<CoscoSupplierBase> selectWzrPageList(CoscoSupplierBase coscoSupplierBase) {
IPage<CoscoSupplierBase> page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize());
//查询当前登录人的部门本级、上级、下级，所有已发起和已准入供应商id
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
List<String> deptIds = new ArrayList<>();
deptIds.add("100");
deptIds.add("222");
coscoSupplierBase.setDeptIdList(deptIds);
//查询当前登录人的部门本级、上级、下级，以外的供应商数据
return coscoSupplierBaseMapper.selectWzrPageList(page,coscoSupplierBase);
@ -409,6 +412,8 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
@Transactional
public Integer update(CoscoSupplierVo vo) {
Date date = CoscoDateUtils.getNowDate();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
//基本信息新增
CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase();
@ -429,7 +434,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
}
//修改基本信息
coscoSupplierBase.setUpdateBy("1");
coscoSupplierBase.setUpdateBy(userId);
coscoSupplierBase.setUpdateTime(date);
coscoSupplierBase.setLastUpdateTime(date);
return coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
@ -459,18 +464,20 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
public Integer insertCoscoSupplierChangeApply(CoscoSupplierBase newCoscoSupplierBase,CoscoSupplierBase oldCoscoSupplierBase,CoscoSupplierVo vo) {
Date date = CoscoDateUtils.getNowDate();
String applyId = PropertyUtils.getSnowflakeId();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
//主体信息---待审批
CoscoSupplierChangeApply coscoSupplierChangeApply = new CoscoSupplierChangeApply();
coscoSupplierChangeApply.setId(applyId);
coscoSupplierChangeApply.setSupplierId(newCoscoSupplierBase.getId());
coscoSupplierChangeApply.setTitle(vo.getTitle());
coscoSupplierChangeApply.setChangeDesc(vo.getChangeDesc());
coscoSupplierChangeApply.setChangeBy("1");
coscoSupplierChangeApply.setChangeBy(userId);
coscoSupplierChangeApply.setChangeTime(date);
coscoSupplierChangeApply.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
coscoSupplierChangeApply.setCreateBy("1");
coscoSupplierChangeApply.setCreateBy(userId);
coscoSupplierChangeApply.setCreateTime(date);
coscoSupplierChangeApply.setUpdateBy("1");
coscoSupplierChangeApply.setUpdateBy(userId);
coscoSupplierChangeApply.setUpdateTime(date);
coscoSupplierChangeApply.setLastUpdateTime(date);
@ -494,9 +501,9 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId());
coscoSupplierSurveyAttachments.setCreateBy("1");
coscoSupplierSurveyAttachments.setCreateBy(userId);
coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setUpdateBy("1");
coscoSupplierSurveyAttachments.setUpdateBy(userId);
coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);
@ -507,14 +514,21 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
return coscoSupplierChangeApplyMapper.insertCoscoSupplierChangeApply(coscoSupplierChangeApply);
}
/**
* 字段比对方法
* @param newCoscoSupplierBase
* @param oldCoscoSupplierBase
* @param supplierChangeApplyId
* @return
*/
public List<CoscoSupplierChangeHistory> compareSupplierChanges(
CoscoSupplierBase newCoscoSupplierBase,
CoscoSupplierBase oldCoscoSupplierBase,
String supplierChangeApplyId) {
List<CoscoSupplierChangeHistory> changeHistories = new ArrayList<>();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
// 获取对象的所有字段
Field[] fields = CoscoSupplierBase.class.getDeclaredFields();
@ -543,9 +557,9 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
history.setOldValue(Optional.ofNullable(oldValue).map(Object::toString).orElse(null));
history.setNewValue(Optional.ofNullable(newValue).map(Object::toString).orElse(null));
history.setCreateBy("1");
history.setCreateBy(userId);
history.setCreateTime(CoscoDateUtils.getNowDate());
history.setUpdateBy("1");
history.setUpdateBy(userId);
history.setUpdateTime(CoscoDateUtils.getNowDate());
history.setLastUpdateTime(CoscoDateUtils.getNowDate());
changeHistories.add(history);

18
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java
View File

@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierDiffVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -23,8 +21,6 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
@Autowired
private CoscoSupplierChangeApplyMapper coscoSupplierChangeApplyMapper;
@Autowired
private CoscoSupplierChangeHistoryMapper coscoSupplierChangeHistoryMapper;
@Override
public IPage<CoscoSupplierChangeApply> getPage(CoscoSupplierChangeApply data) {
@ -50,18 +46,8 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
@Override
public CoscoSupplierDiffVo supplierChangeApplyById(String id) {
CoscoSupplierDiffVo diffVo = new CoscoSupplierDiffVo();
//变更主表 基本信息
CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(id);
diffVo.setCoscoSupplierChangeApply(coscoSupplierChangeApply);
//变更基本内容
CoscoSupplierChangeHistory coscoSupplierChangeHistory = new CoscoSupplierChangeHistory();
coscoSupplierChangeHistory.setSupplierChangeApplyId(id);
List<CoscoSupplierChangeHistory> coscoSupplierChangeHistoryList = coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryList(coscoSupplierChangeHistory);
diffVo.setCoscoSupplierChangeHistoryList(coscoSupplierChangeHistoryList);
return diffVo;
public CoscoSupplierChangeApply supplierChangeApplyById(String id) {
return coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(id);
}
@Override

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

@ -62,7 +62,7 @@
) as c on c.access_work_id = caw.id
WHERE
cas.supplier_id = #{vo.supplierId}
cas.supplier_id = #{vo.supplierId} AND cas.access_status IN (1,2)
<if test="vo.categoryNames != null and vo.categoryNames != ''">
and c.categoryNames like concat('%', #{vo.categoryNames}, '%')
</if>
@ -75,7 +75,6 @@
<if test="vo.endTime!=null and vo.endTime != ''">
and caw.update_time &lt;= #{vo.endTime}
</if>
AND cas.access_status IN (1,2)
ORDER BY caw.update_time desc
</select>

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

@ -47,9 +47,10 @@
WHEN w.access_type = 'scattered' THEN '零星采购/应急采购/个人供应商'
ELSE w.access_type
END AS access_type_text,
w.access_desc,
w.start_time,
w.end_time,
w.review_status,
w.approve_status,
CASE
WHEN w.review_status = 0 THEN '未开始'
WHEN w.review_status = 1 THEN '进行中'
@ -63,7 +64,6 @@
WHEN w.approve_status = 2 THEN '驳回'
ELSE CAST(w.approve_status AS CHAR)
END AS approve_status_text,
w.approve_status,
w.work_flow_id,
w.create_by,
w.create_time,
@ -76,49 +76,45 @@
<sql id="selectCoscoAccessWorkGroupVo">
<sql id="selectCoscoAccessWorkUserReview">
select
IFNULL(cau.is_leader, 0) AS isLeader,
w.id,
w.access_work_name,
w.dept_id,
w.access_type,
CASE
WHEN w.access_type = 'online' THEN '线上准入'
WHEN w.access_type = 'offline' THEN '线下准入'
WHEN w.access_type = 'scattered' THEN '零星采购/应急采购/个人供应商'
ELSE w.access_type
END AS access_type_text,
w.start_time,
w.end_time,
w.review_status,
w.approve_status,
CASE
WHEN w.review_status = 0 THEN '未开始'
WHEN w.review_status = 1 THEN '进行中'
WHEN w.review_status = 2 THEN '结果汇总中'
WHEN w.review_status = 3 THEN '已完成'
ELSE CAST(w.review_status AS CHAR)
END AS review_status_text,
CASE
WHEN w.approve_status = 0 THEN '审批中'
WHEN w.approve_status = 1 THEN '通过'
WHEN w.approve_status = 2 THEN '驳回'
ELSE CAST(w.approve_status AS CHAR)
END AS approve_status_text,
w.work_flow_id,
w.create_by,
w.create_time,
w.update_by,
w.update_time,
w.last_update_time
cau.is_leader,
w.id,
w.access_work_name,
w.dept_id,
w.access_type,
CASE
WHEN w.access_type = 'online' THEN '线上准入'
WHEN w.access_type = 'offline' THEN '线下准入'
WHEN w.access_type = 'scattered' THEN '零星采购/应急采购/个人供应商'
ELSE w.access_type
END AS access_type_text,
w.start_time,
w.end_time,
w.review_status,
w.approve_status,
CASE
WHEN w.review_status = 0 THEN '未开始'
WHEN w.review_status = 1 THEN '进行中'
WHEN w.review_status = 2 THEN '结果汇总中'
WHEN w.review_status = 3 THEN '已完成'
ELSE CAST(w.review_status AS CHAR)
END AS review_status_text,
CASE
WHEN w.approve_status = 0 THEN '审批中'
WHEN w.approve_status = 1 THEN '通过'
WHEN w.approve_status = 2 THEN '驳回'
ELSE CAST(w.approve_status AS CHAR)
END AS approve_status_text,
w.work_flow_id,
w.create_by,
w.create_time,
w.update_by,
w.update_time,
w.last_update_time
FROM
cosco_access_work w
left join cosco_access_user cau on w.id = cau.access_work_id and cau.is_leader = 1
left join cosco_access_category cac on cac.access_work_id = w.id
<if test="vo.userId != null and vo.userId != ''">
and cau.user_id = #{vo.userId}
</if>
left join cosco_access_user cau on w.id = cau.access_work_id
</sql>
<select id="selectCoscoAccessCategoryList"
@ -129,11 +125,18 @@
where c.access_work_id = #{accessWorkId}
</select>
<select id="selectPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork" resultMap="CoscoAccessWorkResult">
<include refid="selectCoscoAccessWorkGroupVo"/>
<include refid="selectCoscoAccessWorkVo"/>
<where>
and w.del_flag = 'normal'
<if test="vo.categoryId != null and vo.categoryId != ''">
and cac.category_id = #{vo.categoryId}
AND EXISTS (
SELECT 1 FROM cosco_access_category
WHERE access_work_id = w.id
AND category_id = #{vo.categoryId}
)
</if>
<if test="vo.createBy != null and vo.createBy != ''">
and w.create_by = #{vo.createBy}
</if>
<if test="vo.accessWorkName != null and vo.accessWorkName != ''">
and w.access_work_name like concat('%', #{vo.accessWorkName}, '%')
@ -169,13 +172,60 @@
order by w.create_time desc
</select>
<select id="selectCoscoAccessWorkUserReviewPage" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork" resultMap="CoscoAccessWorkResult">
<include refid="selectCoscoAccessWorkUserReview"/>
<where>
and w.del_flag = 'normal' and cau.user_id = #{vo.userId}
<if test="vo.categoryId != null and vo.categoryId != ''">
AND EXISTS (
SELECT 1 FROM cosco_access_category
WHERE access_work_id = w.id
AND category_id = #{vo.categoryId}
)
</if>
<if test="vo.createBy != null and vo.createBy != ''">
and w.create_by = #{vo.createBy}
</if>
<if test="vo.accessWorkName != null and vo.accessWorkName != ''">
and w.access_work_name like concat('%', #{vo.accessWorkName}, '%')
</if>
<if test="vo.deptId != null and vo.deptId != ''">
and w.dept_id = #{vo.deptId}
</if>
<if test="vo.applyType != null and vo.applyType != ''">
and w.apply_type = #{vo.applyType}
</if>
<if test="vo.accessType != null and vo.accessType != ''">
and w.access_type = #{vo.accessType}
</if>
<if test="vo.startTime != null ">
and w.start_time = #{vo.startTime}
</if>
<if test="vo.endTime != null ">
and w.end_time = #{vo.endTime}
</if>
<if test="vo.reviewStatus != null ">
and w.review_status = #{vo.reviewStatus}
</if>
<if test="vo.approveStatus != null ">
and w.approve_status = #{vo.approveStatus}
</if>
</where>
order by w.create_time desc
</select>
<select id="selectCoscoAccessWorkList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork" resultMap="CoscoAccessWorkResult">
<include refid="selectCoscoAccessWorkGroupVo"/>
<include refid="selectCoscoAccessWorkVo"/>
<where>
and w.del_flag = 'normal'
<if test="vo.categoryId != null and vo.categoryId != ''">
and cac.category_id = #{vo.categoryId}
AND EXISTS (
SELECT 1 FROM cosco_access_category
WHERE access_work_id = w.id
AND category_id = #{vo.categoryId}
)
</if>
<if test="vo.accessWorkName != null and vo.accessWorkName != ''">
and w.access_work_name like concat('%', #{vo.accessWorkName}, '%')
@ -214,11 +264,15 @@
<select id="selectApproveList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork" resultMap="CoscoAccessWorkResult">
<include refid="selectCoscoAccessWorkGroupVo"/>
<include refid="selectCoscoAccessWorkVo"/>
<where>
and w.del_flag = 'normal'
<if test="vo.categoryId != null and vo.categoryId != ''">
and cac.category_id = #{vo.categoryId}
AND EXISTS (
SELECT 1 FROM cosco_access_category
WHERE access_work_id = w.id
AND category_id = #{vo.categoryId}
)
</if>
<if test="vo.accessWorkName != null and vo.accessWorkName != ''">
and w.access_work_name like concat('%', #{vo.accessWorkName}, '%')

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

@ -160,6 +160,7 @@
cas.access_work_id,
cas.supplier_id,
csb.`name`,
csb.name_en,
caw.update_time,
cas.access_status,
CASE cas.access_status
@ -169,14 +170,14 @@
END AS access_status_cn
FROM
cosco_access_supplier cas
LEFT JOIN cosco_access_work caw ON cas.access_work_id = caw.id
LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id
LEFT JOIN cosco_access_work caw ON cas.access_work_id = caw.id and caw.del_flag = 'normal'
LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id and csb.del_flag = 'normal'
left join (
SELECT
cac.access_work_id,
GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName
FROM cosco_access_category cac
INNER JOIN cosco_category cc ON cac.category_id = cc.id
INNER JOIN cosco_category cc ON cac.category_id = cc.id and cc.del_flag = 'normal'
GROUP BY cac.access_work_id
) as c on c.access_work_id = caw.id
left join dict_project dp on csb.enterprise_type = dp.`code` and dp.parent_code = 'enterprise_type'
@ -191,33 +192,32 @@
WHEN csb.supplier_type = 'pe' THEN id_card
ELSE NULL
END AS unified_code,
CASE
WHEN csb.supplier_type = 'ovs' THEN name_en
ELSE name
END AS name
csb.name,
csb.name_en
FROM
cosco_supplier_base csb
left join (
SELECT
cas.supplier_id
FROM
cosco_access_work caw
LEFT JOIN cosco_access_supplier cas ON caw.id = cas.access_work_id
WHERE
(
caw.approve_status IS NULL
OR caw.approve_status = 0
OR ( caw.approve_status = 1 AND cas.access_status = 1 ))
AND cas.dept_id in
<foreach item="item" collection="vo.deptIdList" open="(" separator="," close=")">
#{item}
</foreach>
SELECT
cas.supplier_id
FROM
cosco_access_work caw
LEFT JOIN cosco_access_supplier cas ON caw.id = cas.access_work_id
WHERE
(
caw.approve_status IS NULL
OR caw.approve_status = 0
OR ( caw.approve_status = 1 AND cas.access_status = 1 )
)
AND cas.dept_id in
<foreach item="item" collection="vo.deptIdList" open="(" separator="," close=")">
#{item}
</foreach>
) b on csb.id = b.supplier_id
</sql>
<select id="selectWzrPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase" resultMap="CoscoSupplierBaseResult">
<include refid="selecWzrListVo"/>
where b.supplier_id is null
where b.supplier_id is null and csb.del_flag = 'normal'
<if test="vo.name != null and vo.name != ''">
and csb.name = #{vo.name} or csb.name_en = #{vo.name}
</if>
@ -473,14 +473,6 @@
and csb.last_update_time = #{lastUpdateTime}
</if>
</where>
GROUP BY
cas.id,
cas.access_work_id,
cas.supplier_id,
csb.`name`,
caw.update_time ,
csb.enterprise_type,
dp.dic_name
order by csb.create_time desc
</select>
@ -517,78 +509,9 @@
<if test="nameEn != null and nameEn != ''">
and name_en = #{nameEn}
</if>
<if test="socialCreditCode != null and socialCreditCode != ''">
and social_credit_code = #{socialCreditCode}
</if>
<if test="range != null and range != ''">
and `range` = #{range}
</if>
<if test="regAddress != null and regAddress != ''">
and reg_address = #{regAddress}
</if>
<if test="workAddress != null and workAddress != ''">
and work_address = #{workAddress}
</if>
<if test="parentCompanyInvestor != null and parentCompanyInvestor != ''">
and parent_company_investor = #{parentCompanyInvestor}
</if>
<if test="legalPerson != null and legalPerson != ''">
and legal_person = #{legalPerson}
</if>
<if test="idCard != null and idCard != ''">
and id_card = #{idCard}
</if>
<if test="capital != null ">
and capital = #{capital}
</if>
<if test="contactsName != null and contactsName != ''">
and contacts_name like concat('%', #{contactsName}, '%')
</if>
<if test="contactsPhone != null and contactsPhone != ''">
and contacts_phone = #{contactsPhone}
</if>
<if test="contactsType != null and contactsType != ''">
and contacts_type = #{contactsType}
</if>
<if test="contactsEmail != null and contactsEmail != ''">
and contacts_email = #{contactsEmail}
</if>
<if test="telephone != null and telephone != ''">
and telephone = #{telephone}
</if>
<if test="nation != null and nation != ''">
and nation = #{nation}
</if>
<if test="vat != null and vat != ''">
and vat = #{vat}
</if>
<if test="taxpayerId != null and taxpayerId != ''">
and taxpayer_id = #{taxpayerId}
</if>
<if test="currency != null and currency != ''">
and currency = #{currency}
</if>
<if test="personName != null and personName != ''">
and person_name like concat('%', #{personName}, '%')
</if>
<if test="personPhone != null and personPhone != ''">
and person_phone = #{personPhone}
</if>
<if test="personBank != null and personBank != ''">
and person_bank = #{personBank}
</if>
<if test="personAccount != null and personAccount != ''">
and person_account = #{personAccount}
</if>
<if test="accessStatus != null ">
and access_status = #{accessStatus}
</if>
<if test="blacklistStatus != null ">
and blacklist_status = #{blacklistStatus}
</if>
<if test="greylistStatus != null ">
and greylist_status = #{greylistStatus}
</if>
<if test="fillinStatus != null ">
and fillin_status = #{fillinStatus}
</if>
@ -602,6 +525,7 @@
and last_update_time = #{lastUpdateTime}
</if>
</where>
order by create_time desc
</select>
<select id="selectCoscoSupplierBaseById" parameterType="String"

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

@ -25,9 +25,11 @@
<result property="title" column="title"/>
<result property="changeDesc" column="change_desc"/>
<result property="enterpriseTypeCn" column="enterprise_type_cn"/>
<collection property="coscoSupplierChangeHistoryList" ofType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory"
resultMap="CoscoSupplierChangeHistoryResult"/>
<collection property="coscoSupplierChangeHistoryList"
column="{supplierChangeApplyId=id}"
ofType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory"
select="selectcoscoSupplierChangeHistoryList"/>
</resultMap>
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory" id="CoscoSupplierChangeHistoryResult">
@ -45,7 +47,10 @@
SELECT
c.id,
c.supplier_id,
sb.`name` AS supplierName,
CASE
WHEN supplier_type = 'ovs' THEN name_en
ELSE sb.`name`
END AS supplierName,
CASE
WHEN sb.supplier_type = 'dvs' THEN
'境内企业'
@ -72,23 +77,14 @@
c.last_update_time,
c.title,
c.change_desc ,
wo.maxTime as update_time,
wo.deptNames,
csch.table_name,
csch.field_name,
csch.field_annotation,
csch.old_value,
csch.new_value
wo.maxTime as update_time
FROM
cosco_supplier_change_apply c
LEFT JOIN cosco_supplier_base sb ON c.supplier_id = sb.id
left join cosco_supplier_change_history csch on csch.supplier_change_apply_id = c.id
left join (
SELECT
cas.supplier_id,
MAX(w.update_time) AS maxTime,
GROUP_CONCAT(DISTINCT w.dept_id SEPARATOR ',') AS deptNames
MAX(w.update_time) AS maxTime
FROM
cosco_access_work w
LEFT JOIN
@ -100,6 +96,14 @@
) wo on wo.supplier_id = sb.id
</sql>
<select id="selectcoscoSupplierChangeHistoryList"
parameterType="map"
resultMap="CoscoSupplierChangeHistoryResult">
select id, supplier_change_apply_id, table_name, field_name, field_annotation, old_value, new_value, del_flag, create_by, create_time, update_by, update_time, last_update_time
from cosco_supplier_change_history
where supplier_change_apply_id = #{supplierChangeApplyId} and del_flag = 'normal'
</select>
<select id="selectPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply" resultMap="CoscoSupplierChangeApplyResult">
SELECT
@ -116,7 +120,10 @@
WHEN sb.supplier_type = 'pe' THEN
'个人'
END AS supplier_type,
sb.`name` AS supplierName,
CASE
WHEN supplier_type = 'ovs' THEN name_en
ELSE sb.`name`
END AS supplierName,
sb.enterprise_type,
dp.dic_name as enterprise_type_cn,
c.change_by,
@ -140,17 +147,17 @@
LEFT JOIN cosco_supplier_base sb ON c.supplier_id = sb.id
left join dict_project dp on sb.enterprise_type = dp.`code` and dp.parent_code = 'enterprise_type'
left join (
SELECT
cas.supplier_id,
MAX(w.update_time) AS maxTime
FROM
cosco_access_work w
LEFT JOIN
cosco_access_supplier cas ON w.id = cas.access_work_id
WHERE
w.apply_type = 0
GROUP BY
cas.supplier_id
SELECT
cas.supplier_id,
MAX(w.update_time) AS maxTime
FROM
cosco_access_work w
LEFT JOIN
cosco_access_supplier cas ON w.id = cas.access_work_id
WHERE
w.apply_type = 0
GROUP BY
cas.supplier_id
) wo on wo.supplier_id = sb.id
WHERE
sb.del_flag = 'normal'
@ -194,6 +201,7 @@
and c.last_update_time = #{vo.lastUpdateTime}
</if>
</where>
order by c.create_time desc
</select>
<select id="selectCoscoSupplierChangeApplyById" parameterType="String"

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

@ -49,6 +49,9 @@
<if test="vo.exitTheme != null and vo.exitTheme != ''">
and exit_theme like concat('%', #{vo.exitTheme}, '%')
</if>
<if test="vo.createBy != null and vo.createBy != ''">
and create_by = #{vo.createBy}
</if>
<if test="vo.exitReason != null and vo.exitReason != ''">
and exit_reason = #{vo.exitReason}
</if>