Compare commits
No commits in common. "7d12bce02e871397808db615f3efb9429facc3ef" and "72ac98b92d84e8859deb450c99cee6c25e5afa4e" have entirely different histories.
7d12bce02e
...
72ac98b92d
|
|
@ -190,6 +190,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
|
|||
return AjaxResult.error("已领数量大于预领数量或该机具未在库");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return AjaxResult.error("出库失败");
|
||||
}
|
||||
return AjaxResult.success("出库成功");
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ public class BmProjectInfoController extends BaseController{
|
|||
util.exportExcel(response, list, "往来单位");
|
||||
}
|
||||
|
||||
/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "项目管理导入", businessType = BusinessType.IMPORT)
|
||||
@RequiresPermissions("system:user:import")
|
||||
@PostMapping("/importData")
|
||||
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
|
||||
|
|
@ -134,5 +134,6 @@ public class BmProjectInfoController extends BaseController{
|
|||
List<BmProjectInfo> bmProjectInfoList = util.importExcel(file.getInputStream());
|
||||
String message = bmProjectInfoService.importBmProjectInfo(bmProjectInfoList, updateSupport);
|
||||
return success(message);
|
||||
}*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public class BmProjectLotController extends BaseController {
|
|||
return bmProjectLotService.updateBmProjectLot(bmProjectLot);
|
||||
}
|
||||
|
||||
/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "项目管理导入", businessType = BusinessType.IMPORT)
|
||||
@RequiresPermissions("system:user:import")
|
||||
@PostMapping("/importData")
|
||||
public AjaxResult importData(MultipartFile file) throws Exception
|
||||
|
|
@ -99,6 +99,6 @@ public class BmProjectLotController extends BaseController {
|
|||
List<BmProjectLotImport> bmProjectLotList = util.importExcel(file.getInputStream());
|
||||
String message = bmProjectLotService.importBmProjectLot(bmProjectLotList);
|
||||
return success(message);
|
||||
}*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ public class BmUnitInfoController extends BaseController{
|
|||
ExcelUtil<BmUnitInfo> util = new ExcelUtil<BmUnitInfo>(BmUnitInfo.class);
|
||||
util.exportExcel(response, list, "往来单位");
|
||||
}
|
||||
/* @ApiOperation(value = "往来单位导入")
|
||||
@ApiOperation(value = "往来单位导入")
|
||||
@Log(title = "往来单位导入", businessType = BusinessType.IMPORT)
|
||||
@RequiresPermissions("system:user:import")
|
||||
@PostMapping("/importData")
|
||||
|
|
@ -173,6 +173,6 @@ public class BmUnitInfoController extends BaseController{
|
|||
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||
String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId);
|
||||
return success(message);
|
||||
}*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ public class ExceptionDict {
|
|||
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"));
|
||||
}*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -223,8 +223,11 @@ public class BackApplyServiceImpl implements BackApplyService {
|
|||
roles = SecurityUtils.getLoginUser().getRoles();
|
||||
userid = SecurityUtils.getLoginUser().getUserid();
|
||||
companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
|
||||
} catch (Exception e) {
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return AjaxResult.error("获取用户信息失败:{}", e);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
int num = 0;
|
||||
if (!StringUtils.isEmpty(bean.getIds())) {
|
||||
|
|
@ -422,7 +425,6 @@ public class BackApplyServiceImpl implements BackApplyService {
|
|||
|
||||
/**
|
||||
* 退料批量审核-审核(web)
|
||||
*
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -435,8 +437,11 @@ public class BackApplyServiceImpl implements BackApplyService {
|
|||
roles = SecurityUtils.getLoginUser().getRoles();
|
||||
userid = SecurityUtils.getLoginUser().getUserid();
|
||||
companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
|
||||
} catch (Exception e) {
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
return AjaxResult.error("获取用户信息失败:{}", e);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(dto.getBackApplyList())) {
|
||||
for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) {
|
||||
|
|
|
|||
|
|
@ -159,6 +159,7 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
|
|||
throw new RuntimeException("配套名称已重复，请重新输入");
|
||||
}*/
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());
|
||||
}
|
||||
return AjaxResult.success("修改成功", res);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import com.bonus.sgzb.material.service.*;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -357,7 +356,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
|
@ -382,7 +381,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
throw new RuntimeException("createBackApplyInfoAndDetails异常");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
return res;
|
||||
|
||||
|
|
@ -509,7 +508,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return res;
|
||||
|
|
@ -562,7 +561,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
|
@ -587,7 +586,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
taskId = Integer.valueOf(task.getId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return taskId;
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_nw
|
||||
namespace: sgzb_nwjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_nw
|
||||
namespace: sgzb_nwjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
Loading…
Reference in New Issue