bonus
/
ahdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

状态变更

This commit is contained in:
mashuai 2024-08-21 18:05:49 +08:00
parent 5d8643cc38
commit cea40b603a
3 changed files with 60 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-base/src/main/java/com/bonus/material/service/impl/MaTypeServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.bonus.base.api.domain.MaType;
import com.bonus.base.api.domain.TreeSelect;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.mapper.MaTypeMapper;
import com.bonus.material.service.MaTypeService;
import com.bonus.material.vo.MaTypeVo;
@ -41,6 +42,7 @@ public class MaTypeServiceImpl implements MaTypeService {
return AjaxResult.error("同级下类型名称存在重复！");
}
maType.setLevel(String.valueOf(Integer.parseInt(maType.getLevel()) + 1));
maType.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
int result = maTypeDao.insert(maType);
if (result > 0) {
return AjaxResult.success("添加成功");

58
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java
View File

@ -1,24 +1,74 @@
package com.bonus.purchase.utils;
/**
* 常量类
* 新购模块状态常量类
* @Author ma_sh
* @create 2024/8/20 16:54
*/
public class Constants {
/**
* 待提交
*/
public static final Integer PENDING_SUBMISSION = 47;
/**
* 待确认
*/
public static final Integer PENDING_CONFIRMATION = 48;
/**
* 待通知
*/
public static final Integer PENDING_NOTIFICATION = 49;
/**
* 待验收
*/
public static final Integer PENDING_ACCEPTANCE = 47;
public static final Integer PENDING_ACCEPTANCE = 50;
/**
* 已确认
*/
public static final Integer CONFIRMED = 51;
/**
* 已验收
*/
public static final Integer PURCHASE_ACCEPTED = 48;
public static final Integer PURCHASE_ACCEPTED = 52;
/**
* 待绑定
*/
public static final Integer PENDING_BINDING = 53;
/**
* 已绑定
*/
public static final Integer BINDING = 54;
/**
* 待入库
*/
public static final Integer PENDING_INVENTORY = 55;
/**
* 已入库
*/
public static final Integer INVENTORY = 56;
/**
* 已完成
*/
public static final Integer PURCHASE_PASSED = 57;
/**
* 已驳回
*/
public static final Integer REJECTED = 58;
/**
* 不通过
*/
public static final Integer PURCHASE_NO_PASSED = 49;
public static final Integer PURCHASE_NO_PASSED = 59;
}

7
bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml
View File

@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SUM( bp.purchase_price ) AS purchasePrice,
SUM( bp.notax_price ) AS notaxPrice,
CONCAT(bp.tax_rate, '%') AS taxRate,
bt.creator AS createBy,
su.nick_name AS createBy,
bt.create_time AS createTime,
bt.`status` AS STATUS,
sda.dict_label AS statusName,
@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bpm_task bt ON bp.task_id = bt.id
LEFT JOIN ma_type mt ON bp.type_id = mt.id
LEFT JOIN sys_dict_data sda ON sda.dict_code = bt.`status`
LEFT JOIN sys_user su ON bt.creator = su.user_id
WHERE
bp.is_active = '1'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@ -57,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="keyWord != null and keyWord != ''">
AND (
bt.`code` LIKE CONCAT('%',#{keyWord},'%')
OR mt1.`name` LIKE CONCAT('%',#{keyWord},'%')
OR GROUP_CONCAT( mt.`name` ) LIKE CONCAT('%',#{keyWord},'%')
OR bp.tax_rate = #{keyWord}
OR bt.creator LIKE CONCAT('%',#{keyWord},'%')
OR su.nick_name LIKE CONCAT('%',#{keyWord},'%')
OR bt.remark LIKE CONCAT('%',#{keyWord},'%')
)
</if>