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-08-11 15:19:28 +08:00
parent 9c3dadd670
commit d91bfaac6d
9 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
View File

@ -59,7 +59,7 @@ public class CoscoMessageController extends BaseController {
}
/**
* 获取这个登录的供应商所有未读品类退出消息
* 获取这个登录的供应商所有未读品类退出消息--(暂时只有供应商能用上)
* @return
*/
@ApiOperation("查询数据")
@ -78,6 +78,30 @@ public class CoscoMessageController extends BaseController {
}
/**
* 获取当前登录人所有未读消息
* @return
*/
@ApiOperation("查询数据")
@GetMapping("/getCountMessage")
public BaseResponse getCountMessage() {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
CoscoMessage coscoMessage = new CoscoMessage();
coscoMessage.setRead(0l);//未读
//如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情
if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){
CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId());
coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId());
}else{
coscoMessage.setReceiverId(currentUser.getUserId());
}
return BaseResponse.success(coscoMessageService.getCountMessage(coscoMessage));
}
/**
* 批量修改已读状态----暂时没用
* @param ids

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java
View File

@ -31,6 +31,9 @@ public interface CoscoMessageMapper {
List<CoscoMessage> selectCoscoMessageList(CoscoMessage vo);
String selectCountMessage(CoscoMessage vo);
/**
* 新增供应商业务处理消息推送
*

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java
View File

@ -57,9 +57,16 @@ public class CoscoAccessUser extends CoscoBaseEntity {
*/
private String deptName;
/**
* 单位名称
*/
private String orgName;
/**
* 人员名称
*/
private String userName;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java
View File

@ -21,6 +21,8 @@ public interface ICoscoMessageService {
List<CoscoMessage> getExitMge(CoscoMessage data);
String getCountMessage(CoscoMessage data);
/**
* 查询供应商业务处理消息推送
*

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

@ -190,6 +190,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
SysOrg dept = orgService.getOrgInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setDeptName(dept.getOrgName());//准入部门
coscoAccessWork.setOrgName(dept.getCuCompanyName());//准入单位
vo.setCoscoAccessWork(coscoAccessWork);
//供应商信息
@ -224,6 +225,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
accessUser.setDeptName(org.getOrgName());
accessUser.setOrgName(org.getCuCompanyName());// 设置单位名称
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java
View File

@ -53,6 +53,11 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
return coscoMessageList;
}
@Override
public String getCountMessage(CoscoMessage data) {
return coscoMessageMapper.selectCountMessage(data);
}
/**
* 查询供应商业务处理消息推送
*

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

@ -65,12 +65,6 @@
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,
@ -108,12 +102,6 @@
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,

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

@ -64,6 +64,25 @@
</where>
</select>
<select id="selectCountMessage" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage" resultType="String">
SELECT
count(0)
FROM
cosco_message m
<where>
<if test="receiverId != null and receiverId != ''">
and m.receiver_id = #{receiverId}
</if>
<if test="read != null ">
and m.`read` = #{read}
</if>
<if test="type != null and type != ''">
and m.type = #{type}
</if>
</where>
</select>
<select id="selectCoscoMessageById" parameterType="String"
resultMap="CoscoMessageResult">
<include refid="selectCoscoMessageVo"/>

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

@ -66,14 +66,6 @@
c.change_by,
c.change_time,
c.approve_status,
CASE
WHEN c.approve_status = 0 THEN
'审批中'
WHEN c.approve_status = 1 THEN
'通过'
WHEN c.approve_status = 2 THEN
'驳回' ELSE CAST( c.approve_status AS CHAR )
END AS approve_status_text,
c.work_flow_id,
c.del_flag,
c.create_time,
@ -132,15 +124,6 @@
c.change_by,
c.change_time,
c.approve_status,
CASE
WHEN c.approve_status = 0 THEN
'待审批'
WHEN c.approve_status = 1 THEN
'通过'
WHEN c.approve_status = 2 THEN
'驳回' ELSE CAST( c.approve_status AS CHAR )
END AS approve_status_text,
c.work_flow_id,
c.create_time,
wo.maxTime as update_time