diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java index eb2dca1..a6a1b84 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java @@ -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> 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)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java index 1c628dc..c4c8a4a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java @@ -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> 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 返回结果 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java index d0260da..900ef9a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java @@ -286,7 +286,6 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - return BaseResponse.success(coscoSupplierBaseService.selectCoscoSupplierBaseById(id)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java index 0f5a26e..5a9c271 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java @@ -48,7 +48,7 @@ public class CoscoSupplierChangeApplyController extends BaseController { */ @ApiOperation("查询数据") @GetMapping("/supplierChangeApplyById/{id}") - public BaseResponse supplierChangeApplyById(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + public BaseResponse supplierChangeApplyById(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(coscoSupplierChangeApplyService.supplierChangeApplyById(id)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java index a3e0a80..6e40ce4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java @@ -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> 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)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java index 3658600..034568a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java @@ -14,9 +14,24 @@ import java.util.List; */ public interface CoscoAccessWorkMapper { - + /** + * 供应商准入管理列表 + * @param page + * @param vo + * @return + */ IPage selectPageList(IPage page, @Param("vo") CoscoAccessWork vo); + /** + * 供应商准入评审列表 + * @param page + * @param vo + * @return + */ + IPage selectCoscoAccessWorkUserReviewPage(IPage page, @Param("vo") CoscoAccessWork vo); + + + IPage selectApproveList(CoscoAccessWork coscoAccessWork); /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java index 13ecc14..19fb58c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java deleted file mode 100644 index a8871f0..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java +++ /dev/null @@ -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 coscoSupplierChangeHistoryList; -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java index 44f4688..cbf1102 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java @@ -25,6 +25,9 @@ public interface ICoscoAccessWorkService { */ IPage getPage(CoscoAccessWork data); + IPage selectCoscoAccessWorkUserReviewPage(CoscoAccessWork data); + + IPage getApprovePage(CoscoAccessWork data); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java index 84d6aa1..97cbe6c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java index a48009a..674eaf7 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java @@ -110,6 +110,14 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { return coscoAccessWorkMapper.selectPageList(page, data); } + @Override + public IPage selectCoscoAccessWorkUserReviewPage(CoscoAccessWork data) { + IPage page = new Page<>(data.getPageNo(), data.getPageSize()); + //只查询供应商准入 + data.setApplyType(CoscoType.APPLY_TYPE_GYSZR); + return coscoAccessWorkMapper.selectCoscoAccessWorkUserReviewPage(page, data); + } + @Override public IPage 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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index 8026f80..354c7a0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -106,8 +106,11 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl selectWzrPageList(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); //查询当前登录人的部门本级、上级、下级,所有已发起和已准入供应商id + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId(); List 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 compareSupplierChanges( CoscoSupplierBase newCoscoSupplierBase, CoscoSupplierBase oldCoscoSupplierBase, String supplierChangeApplyId) { List 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 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 coscoSupplierChangeHistoryList = coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryList(coscoSupplierChangeHistory); - diffVo.setCoscoSupplierChangeHistoryList(coscoSupplierChangeHistoryList); - return diffVo; + public CoscoSupplierChangeApply supplierChangeApplyById(String id) { + return coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(id); } @Override diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml index 85906e1..fbe053c 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml @@ -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) and c.categoryNames like concat('%', #{vo.categoryNames}, '%') @@ -75,7 +75,6 @@ and caw.update_time <= #{vo.endTime} - AND cas.access_status IN (1,2) ORDER BY caw.update_time desc diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml index 7cfe89d..10884b7 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml @@ -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 @@ - + 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 - - and cau.user_id = #{vo.userId} - + left join cosco_access_user cau on w.id = cau.access_work_id - + and w.del_flag = 'normal' - 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} + ) + + + and w.create_by = #{vo.createBy} and w.access_work_name like concat('%', #{vo.accessWorkName}, '%') @@ -169,13 +172,60 @@ order by w.create_time desc + + + - + and w.del_flag = 'normal' - 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} + ) and w.access_work_name like concat('%', #{vo.accessWorkName}, '%') diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index 3c1ae83..43864d0 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -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 - - #{item} - + 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 + + #{item} + ) b on csb.id = b.supplier_id @@ -517,78 +509,9 @@ and name_en = #{nameEn} - - and social_credit_code = #{socialCreditCode} - and `range` = #{range} - - and reg_address = #{regAddress} - - - and work_address = #{workAddress} - - - and parent_company_investor = #{parentCompanyInvestor} - - - and legal_person = #{legalPerson} - - - and id_card = #{idCard} - - - and capital = #{capital} - - - and contacts_name like concat('%', #{contactsName}, '%') - - - and contacts_phone = #{contactsPhone} - - - and contacts_type = #{contactsType} - - - and contacts_email = #{contactsEmail} - - - and telephone = #{telephone} - - - and nation = #{nation} - - - and vat = #{vat} - - - and taxpayer_id = #{taxpayerId} - - - and currency = #{currency} - - - and person_name like concat('%', #{personName}, '%') - - - and person_phone = #{personPhone} - - - and person_bank = #{personBank} - - - and person_account = #{personAccount} - - - and access_status = #{accessStatus} - - - and blacklist_status = #{blacklistStatus} - - - and greylist_status = #{greylistStatus} - and fillin_status = #{fillinStatus} @@ -602,6 +525,7 @@ and last_update_time = #{lastUpdateTime} + order by create_time desc + 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' + +