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-24 16:36:24 +08:00
parent 06fe4bfe18
commit 3c7410ea57
9 changed files with 52 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/MessageConstant.java Normal file
View File

@ -0,0 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public class MessageConstant {
/**
* 黑名单到期提醒
*/
public static final String BLACKLIST_EXPIRE = "blacklist_expires";
}

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

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -16,8 +17,8 @@ public class UserController {
@GetMapping("/getUserList")
public List<UserVo> getUserList() {
return getUser();
public BaseResponse getUserList() {
return BaseResponse.success(getUser());
}

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

@ -4,6 +4,7 @@ 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.AnnualreviewTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService;
@ -104,9 +105,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
public int insertCoscoAnnualreviewTask(AddTaskVo taskVo) {
taskVo.setCreateTime(new Date());
taskVo.setUpdateTime(new Date());
taskVo.setUpdateBy("admin");
taskVo.setUpdateBy(SupplierUserConstant.USER_NAME);
taskVo.setId(PropertyUtils.getSnowflakeId());
taskVo.setCreateBy("admin");
taskVo.setCreateBy(SupplierUserConstant.USER_NAME);
taskVo.setStatus(AnnualreviewTaskConstant.NOT_START);
coscoAnnualreviewTaskMapper.insertCoscoAnnualreviewTask(taskVo);
addList(taskVo);
@ -130,9 +131,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
taskSupplier.setId(PropertyUtils.getSnowflakeId());
taskSupplier.setAnnualreviewTaskId(taskVo.getId());
taskSupplier.setSupplierId(vo.getSuppliedId());
taskSupplier.setCreateBy("admin");
taskSupplier.setCreateBy(SupplierUserConstant.USER_NAME);
taskSupplier.setCreateTime(new Date());
taskSupplier.setUpdateBy("admin");
taskSupplier.setUpdateBy(SupplierUserConstant.USER_NAME);
taskSupplier.setUpdateTime(new Date());
taskSupplierList.add(taskSupplier);
List<String> userIds = vo.getUserIds();
@ -143,9 +144,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
taskSupplierUser.setAnnualreviewTaskId(taskVo.getId());
taskSupplierUser.setSupplierId(vo.getSuppliedId());
taskSupplierUser.setUserId(userId);
taskSupplierUser.setCreateBy("admin");
taskSupplierUser.setCreateBy(SupplierUserConstant.USER_NAME);
taskSupplierUser.setCreateTime(new Date());
taskSupplierUser.setUpdateBy("admin");
taskSupplierUser.setUpdateBy(SupplierUserConstant.USER_NAME);
taskSupplierUser.setReviewStatus(AnnualreviewTaskConstant.WAIT_APPROVE);
taskSupplierUser.setUpdateTime(new Date());
taskSupplierUserList.add(taskSupplierUser);
@ -154,9 +155,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
scoring.setId(PropertyUtils.getSnowflakeId());
scoring.setAnnualreviewTaskSupplierUserId(taskSupplierUser.getId());
scoring.setTemplateItemId(ind.getId());
scoring.setCreateBy("admin");
scoring.setCreateBy(SupplierUserConstant.USER_NAME);
scoring.setCreateTime(new Date());
scoring.setUpdateBy("admin");
scoring.setUpdateBy(SupplierUserConstant.USER_NAME);
scoring.setUpdateTime(new Date());
scoringList.add(scoring);
});

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddCoscoAnnualreviewTemplateVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -105,10 +106,10 @@ public class CoscoAnnualreviewTemplateIndicatorServiceImpl implements ICoscoAnnu
for (CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator : indicatorList) {
coscoAnnualreviewTemplateIndicator.setCreateTime(new Date());
coscoAnnualreviewTemplateIndicator.setUpdateTime(new Date());
coscoAnnualreviewTemplateIndicator.setUpdateBy("admin");
coscoAnnualreviewTemplateIndicator.setUpdateBy(SupplierUserConstant.USER_NAME);
coscoAnnualreviewTemplateIndicator.setTemplateId(coscoAnnualreviewTemplate.getId());
coscoAnnualreviewTemplateIndicator.setId(PropertyUtils.getSnowflakeId());
coscoAnnualreviewTemplateIndicator.setCreateBy("admin");
coscoAnnualreviewTemplateIndicator.setCreateBy(SupplierUserConstant.USER_NAME);
}
coscoAnnualreviewTemplateIndicatorMapper.batchCoscoAnnualreviewTemplateIndicator(indicatorList);
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
View File

@ -4,6 +4,7 @@ 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.ReviewTemplateConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator;
@ -70,9 +71,9 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
public int insertCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
coscoAnnualreviewTemplate.setCreateTime(new Date());
coscoAnnualreviewTemplate.setUpdateTime(new Date());
coscoAnnualreviewTemplate.setUpdateBy("admin");
coscoAnnualreviewTemplate.setUpdateBy(SupplierUserConstant.USER_NAME);
coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId());
coscoAnnualreviewTemplate.setCreateBy("admin");
coscoAnnualreviewTemplate.setCreateBy(SupplierUserConstant.USER_NAME);
coscoAnnualreviewTemplateMapper.insertCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate);
coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate);
return 1;

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
View File

@ -232,7 +232,8 @@
<select id="selectBecomeDue" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo">
select cb.dept_id deptId,
cb.create_by creater,
csb.name
csb.name ,
csb.id
from cosco_blacklist cb
join cosco_blacklist_supplier cbs on cb.id = cbs.blacklist_id

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java
View File

@ -16,5 +16,9 @@ public class BecomeDueVo {
* 创建人
*/
private String creater;
/**
* 供应商id
*/
private String id;
}

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java
View File

@ -2,12 +2,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ScheduledTasksService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CalculateAndObtainScoresVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
@ -37,6 +40,8 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
@Autowired
private ICoscoBlacklistService coscoBlacklistService;
@Autowired
private CoscoMessageMapper coscoMessageMapper;
/**
* 定时任务查看待开启的任务。如果时间小于当前时间那么开启任务
@ -179,9 +184,18 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
public void blacklistExpire() {
//黑名单到期提醒
List<BecomeDueVo> becomeDueVos = coscoBlacklistService.selectBecomeDue();
List<CoscoMessage> coscoMessages = new ArrayList<>();
//添加消息
becomeDueVos.forEach(becomeDueVo ->{
CoscoMessage coscoMessage = new CoscoMessage();
coscoMessage.setId(PropertyUtils.getSnowflakeId());
coscoMessage.setReceiverId(becomeDueVo.getCreater());
coscoMessage.setContent("您准入的"+becomeDueVo.getName()+"供应商黑名单时效到期，请及时提交解除申请：");
coscoMessage.setType(MessageConstant.BLACKLIST_EXPIRE);
coscoMessage.setCreateTime(new Date());
coscoMessage.setUpdateTime(new Date());
coscoMessages.add(coscoMessage);
});
coscoMessageMapper.batchCoscoMessage(coscoMessages);
}
}

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

@ -623,11 +623,12 @@
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo">
SELECT
csb.id,
cas.dept_id AS deptId,
caw.update_time AS admissionTime,
MAX(cetss.level_name) AS levelName,
MAX(csb.name) AS name,
MAX(cas.dept_id) AS deptId,
MAX(caw.id) AS accessWorkId,
MAX(caw.update_time) AS admissionTime,
MAX(category_info.categoryName) AS categoryName,
MAX(cetss.level_name) AS levelName,
MAX(cetss.update_time) AS evaluationTime
FROM
cosco_access_supplier cas
@ -706,9 +707,7 @@
</if>
)
GROUP BY
csb.id,
cas.dept_id,
caw.update_time
csb.id
</select>
<select id="selectSupplierByIds" parameterType="list"