bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单位

This commit is contained in:
mashuai 2024-10-24 15:21:58 +08:00
parent 74a12d689e
commit 1648e6a51f
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java
View File

@ -46,7 +46,7 @@ public class BmProjectController extends BaseController
* 查询标段工程管理列表
*/
@ApiOperation(value = "查询标段工程管理列表")
@RequiresPermissions("basic:project:list")
//@RequiresPermissions("basic:project:list")
@GetMapping("/list")
public TableDataInfo list(BmProject bmProject)
{

26
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java
View File

@ -103,41 +103,41 @@ public class BmProjectServiceImpl implements IBmProjectService
*/
private void extracted(BmProject item) {
if (item.getProTypeId() != null) {
if (ZERO_CONSTANT.equals(item.getProTypeId())) {
if (ZERO_CONSTANT.equals(Integer.valueOf(item.getProTypeId()))) {
item.setProType("线路工程");
} else if (ONE_CONSTANT.equals(item.getProTypeId())) {
} else if (ONE_CONSTANT.equals(Integer.valueOf(item.getProTypeId()))) {
item.setProType("变电工程");
} else if (TWO_CONSTANT.equals(item.getProTypeId())) {
} else if (TWO_CONSTANT.equals(Integer.valueOf(item.getProTypeId()))) {
item.setProType("业务工程");
} else if (THREE_CONSTANT.equals(item.getProTypeId())) {
} else if (THREE_CONSTANT.equals(Integer.valueOf(item.getProTypeId()))) {
item.setProType("其他工程");
} else {
item.setProType("未知工程类型");
}
}
if (item.getProNature() != null) {
if (ZERO_CONSTANT.equals(item.getProNature())) {
if (ZERO_CONSTANT.equals(Integer.valueOf(item.getProNature()))) {
item.setProNature("基建");
} else if (ONE_CONSTANT.equals(item.getProNature())) {
} else if (ONE_CONSTANT.equals(Integer.valueOf(item.getProNature()))) {
item.setProNature("用户工程");
} else if (TWO_CONSTANT.equals(item.getProNature())){
} else if (TWO_CONSTANT.equals(Integer.valueOf(item.getProNature()))){
item.setProNature("技修大改");
} else if (THREE_CONSTANT.equals(item.getProNature())) {
} else if (THREE_CONSTANT.equals(Integer.valueOf(item.getProNature()))) {
item.setProNature("其他");
} else {
item.setProNature("未知工程性质");
}
}
if (item.getProStatus() != null) {
if (ZERO_CONSTANT.equals(item.getProStatus())) {
if (ZERO_CONSTANT.equals(Integer.valueOf(item.getProStatus()))) {
item.setProStatus("开工准备");
} else if (ONE_CONSTANT.equals(item.getProStatus())) {
} else if (ONE_CONSTANT.equals(Integer.valueOf(item.getProStatus()))) {
item.setProStatus("在建");
} else if (TWO_CONSTANT.equals(item.getProStatus())){
} else if (TWO_CONSTANT.equals(Integer.valueOf(item.getProStatus()))){
item.setProStatus("停工");
} else if (THREE_CONSTANT.equals(item.getProStatus())){
} else if (THREE_CONSTANT.equals(Integer.valueOf(item.getProStatus()))){
item.setProStatus("完工未竣工");
} else if (FOUR_CONSTANT.equals(item.getProStatus())) {
} else if (FOUR_CONSTANT.equals(Integer.valueOf(item.getProStatus()))) {
item.setProStatus("竣工");
} else {
item.setProStatus("未知工程状态");

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java
View File

@ -253,9 +253,9 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
*/
private int updatePurchaseInfoAndDetails(PurchaseVo detail, int purchaseId) {
int result = purchaseStorageMapper.updateStatusById(MaterialConstants.FIVE_CONSTANT, purchaseId);
if (ZERO_CONSTANT.equals(detail.getManageType())) {
if (ZERO_CONSTANT.equals(Integer.valueOf(detail.getManageType()))) {
result += purchaseStorageMapper.insertMachine(detail);
} else if (ONE_CONSTANT.equals(detail.getManageType())) {
} else if (ONE_CONSTANT.equals(Integer.valueOf(detail.getManageType()))) {
result += purchaseStorageMapper.updateStorageNum(detail.getBindNum(), detail.getTypeId());
}
return result + purchaseStorageMapper.updateNum(detail.getPurchaseId(), detail.getBindNum());
@ -297,9 +297,9 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
.mapToInt(detail -> {
int result = purchaseStorageMapper.updateNum(detail.getPurchaseId(), detail.getBindNum());
result += purchaseStorageMapper.updateStatusById(MaterialConstants.FIVE_CONSTANT, Integer.parseInt(detail.getPurchaseId()));
if (ZERO_CONSTANT.equals(detail.getManageType())) {
if (ZERO_CONSTANT.equals(Integer.valueOf(detail.getManageType()))) {
result += purchaseStorageMapper.insertMachine(detail);
} else if (ONE_CONSTANT.equals(detail.getManageType())) {
} else if (ONE_CONSTANT.equals(Integer.valueOf(detail.getManageType()))) {
result += purchaseStorageMapper.updateStorageNum(detail.getBindNum(), detail.getTypeId());
}
return result;