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

Merge branch 'test-0831-audit'

This commit is contained in:
liang.chao 2024-09-02 09:22:45 +08:00
parent 72ac98b92d 184f07d25c
commit 7d12bce02e
9 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -190,7 +190,6 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
return AjaxResult.error("已领数量大于预领数量或该机具未在库"); return AjaxResult.error("已领数量大于预领数量或该机具未在库");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return AjaxResult.error("出库失败"); return AjaxResult.error("出库失败");
} }
return AjaxResult.success("出库成功"); return AjaxResult.success("出库成功");

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java
View File

@ -125,7 +125,7 @@ public class BmProjectInfoController extends BaseController{
util.exportExcel(response, list, "往来单位"); util.exportExcel(response, list, "往来单位");
} }
@Log(title = "项目管理导入", businessType = BusinessType.IMPORT) /* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT)
@RequiresPermissions("system:user:import") @RequiresPermissions("system:user:import")
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
@ -134,6 +134,5 @@ public class BmProjectInfoController extends BaseController{
List<BmProjectInfo> bmProjectInfoList = util.importExcel(file.getInputStream()); List<BmProjectInfo> bmProjectInfoList = util.importExcel(file.getInputStream());
String message = bmProjectInfoService.importBmProjectInfo(bmProjectInfoList, updateSupport); String message = bmProjectInfoService.importBmProjectInfo(bmProjectInfoList, updateSupport);
return success(message); return success(message);
} }*/
} }

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java
View File

@ -90,7 +90,7 @@ public class BmProjectLotController extends BaseController {
return bmProjectLotService.updateBmProjectLot(bmProjectLot); return bmProjectLotService.updateBmProjectLot(bmProjectLot);
} }
@Log(title = "项目管理导入", businessType = BusinessType.IMPORT) /* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT)
@RequiresPermissions("system:user:import") @RequiresPermissions("system:user:import")
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception public AjaxResult importData(MultipartFile file) throws Exception
@ -99,6 +99,6 @@ public class BmProjectLotController extends BaseController {
List<BmProjectLotImport> bmProjectLotList = util.importExcel(file.getInputStream()); List<BmProjectLotImport> bmProjectLotList = util.importExcel(file.getInputStream());
String message = bmProjectLotService.importBmProjectLot(bmProjectLotList); String message = bmProjectLotService.importBmProjectLot(bmProjectLotList);
return success(message); return success(message);
} }*/
} }

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java
View File

@ -162,7 +162,7 @@ public class BmUnitInfoController extends BaseController{
ExcelUtil<BmUnitInfo> util = new ExcelUtil<BmUnitInfo>(BmUnitInfo.class); ExcelUtil<BmUnitInfo> util = new ExcelUtil<BmUnitInfo>(BmUnitInfo.class);
util.exportExcel(response, list, "往来单位"); util.exportExcel(response, list, "往来单位");
} }
@ApiOperation(value = "往来单位导入") /* @ApiOperation(value = "往来单位导入")
@Log(title = "往来单位导入", businessType = BusinessType.IMPORT) @Log(title = "往来单位导入", businessType = BusinessType.IMPORT)
@RequiresPermissions("system:user:import") @RequiresPermissions("system:user:import")
@PostMapping("/importData") @PostMapping("/importData")
@ -173,6 +173,6 @@ public class BmUnitInfoController extends BaseController{
Long userId = SecurityUtils.getLoginUser().getUserid(); Long userId = SecurityUtils.getLoginUser().getUserid();
String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId); String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId);
return success(message); return success(message);
} }*/
} }

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java
View File

@ -36,9 +36,9 @@ public class ExceptionDict {
public static final String ERROR_OCCURRED_DURING_SCRAP_TASK_REVIEW_MSG = "报废任务审核失败!"; public static final String ERROR_OCCURRED_DURING_SCRAP_TASK_REVIEW_MSG = "报废任务审核失败!";
public static void main(String[] args) { /* public static void main(String[] args) {
System.out.println(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"name")); System.out.println(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"name"));
} }*/
} }

11
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -223,11 +223,8 @@ public class BackApplyServiceImpl implements BackApplyService {
roles = SecurityUtils.getLoginUser().getRoles(); roles = SecurityUtils.getLoginUser().getRoles();
userid = SecurityUtils.getLoginUser().getUserid(); userid = SecurityUtils.getLoginUser().getUserid();
companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
} catch (NullPointerException e) {
e.printStackTrace();
return AjaxResult.error("获取用户信息失败:{}", e);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); return AjaxResult.error("获取用户信息失败:{}", e);
} }
int num = 0; int num = 0;
if (!StringUtils.isEmpty(bean.getIds())) { if (!StringUtils.isEmpty(bean.getIds())) {
@ -425,6 +422,7 @@ public class BackApplyServiceImpl implements BackApplyService {
/** /**
* 退料批量审核-审核(web) * 退料批量审核-审核(web)
*
* @param dto * @param dto
* @return * @return
*/ */
@ -437,11 +435,8 @@ public class BackApplyServiceImpl implements BackApplyService {
roles = SecurityUtils.getLoginUser().getRoles(); roles = SecurityUtils.getLoginUser().getRoles();
userid = SecurityUtils.getLoginUser().getUserid(); userid = SecurityUtils.getLoginUser().getUserid();
companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
} catch (NullPointerException e) {
e.printStackTrace();
return AjaxResult.error("获取用户信息失败:{}", e);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); return AjaxResult.error("获取用户信息失败:{}", e);
} }
if (CollectionUtils.isNotEmpty(dto.getBackApplyList())) { if (CollectionUtils.isNotEmpty(dto.getBackApplyList())) {
for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) {

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java
View File

@ -159,7 +159,6 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
throw new RuntimeException("配套名称已重复，请重新输入"); throw new RuntimeException("配套名称已重复，请重新输入");
}*/ }*/
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg()); return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());
} }
return AjaxResult.success("修改成功", res); return AjaxResult.success("修改成功", res);

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
View File

@ -13,6 +13,7 @@ import com.bonus.sgzb.material.service.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -356,7 +357,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
return res; return res;
} }
@ -381,7 +382,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
throw new RuntimeException("createBackApplyInfoAndDetails异常"); throw new RuntimeException("createBackApplyInfoAndDetails异常");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
return res; return res;
@ -508,7 +509,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
return res; return res;
@ -561,7 +562,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
return res; return res;
} }
@ -586,7 +587,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
taskId = Integer.valueOf(task.getId()); taskId = Integer.valueOf(task.getId());
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
return taskId; return taskId;
@ -599,7 +600,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
directApplyInfos.setStatus("1"); directApplyInfos.setStatus("1");
directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
directApplyInfos.setAuditTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
res = refuseDirectApplyInfo(directApplyInfos); res = refuseDirectApplyInfo(directApplyInfos);
} else { } else {
return res; return res;

4
sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml
View File

@ -16,11 +16,11 @@ spring:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
namespace: sgzb_nwjj namespace: sgzb_cloud_dev_nw
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
namespace: sgzb_nwjj namespace: sgzb_cloud_dev_nw
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置