Merge branch 'dev' into test
This commit is contained in:
commit
e0c1718699
|
|
@ -45,7 +45,7 @@ public class AppMenuController extends BaseController {
|
||||||
@PostMapping("/addMenuById")
|
@PostMapping("/addMenuById")
|
||||||
public AjaxResult addMenuById(@RequestBody AppMenu bean)
|
public AjaxResult addMenuById(@RequestBody AppMenu bean)
|
||||||
{
|
{
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||||
return toAjax(service.addMenuById(bean.getMenuId(), userId));
|
return toAjax(service.addMenuById(bean.getMenuId(), userId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -54,7 +54,7 @@ public class AppMenuController extends BaseController {
|
||||||
@DeleteMapping("/delMenuById")
|
@DeleteMapping("/delMenuById")
|
||||||
public AjaxResult delMenuById(@RequestBody AppMenu bean)
|
public AjaxResult delMenuById(@RequestBody AppMenu bean)
|
||||||
{
|
{
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||||
return toAjax(service.delMenuById(bean.getMenuId(),userId));
|
return toAjax(service.delMenuById(bean.getMenuId(),userId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ public class LeaseUserBookController extends BaseController {
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public AjaxResult getLeaseUserBook(){
|
public AjaxResult getLeaseUserBook(){
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||||
return AjaxResult.success(service.getLeaseUserBook(userId));
|
return AjaxResult.success(service.getLeaseUserBook(userId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ public class LeaseUserBookServiceImpl implements LeaseUserBookService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int add(LeaseUserBook bean) {
|
public int add(LeaseUserBook bean) {
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||||
bean.setUserId(userId);
|
bean.setUserId(userId);
|
||||||
return mapper.add(bean);
|
return mapper.add(bean);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ public class PurchaseInputServiceImpl implements PurchaseInputService {
|
||||||
TmTask task = new TmTask();
|
TmTask task = new TmTask();
|
||||||
task.setTaskId(taskId);
|
task.setTaskId(taskId);
|
||||||
task.setTaskStatus(28);
|
task.setTaskStatus(28);
|
||||||
task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
task.setUpdateTime(DateUtils.getNowDate());
|
task.setUpdateTime(DateUtils.getNowDate());
|
||||||
purchaseInputMapper.updateTmTask(task);
|
purchaseInputMapper.updateTmTask(task);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@ public class BmUnitInfoController extends BaseController{
|
||||||
{
|
{
|
||||||
ExcelUtil<BmUnitInfo> util = new ExcelUtil<BmUnitInfo>(BmUnitInfo.class);
|
ExcelUtil<BmUnitInfo> util = new ExcelUtil<BmUnitInfo>(BmUnitInfo.class);
|
||||||
List<BmUnitInfo> bmUnitInfoList = util.importExcel(file.getInputStream());
|
List<BmUnitInfo> bmUnitInfoList = util.importExcel(file.getInputStream());
|
||||||
Long userId = SecurityUtils.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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -232,7 +232,7 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService {
|
||||||
beans.setTypeIds(typeId);
|
beans.setTypeIds(typeId);
|
||||||
beans.setPropId(bean.getPropId());
|
beans.setPropId(bean.getPropId());
|
||||||
beans.setCompanyId(bean.getCompanyId());
|
beans.setCompanyId(bean.getCompanyId());
|
||||||
beans.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
beans.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
list.add(beans);
|
list.add(beans);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,21 +52,21 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService
|
||||||
task.setCode(purchaseCodeRule());
|
task.setCode(purchaseCodeRule());
|
||||||
task.setCreateTime(DateUtils.getNowDate());
|
task.setCreateTime(DateUtils.getNowDate());
|
||||||
task.setCompanyId(purchasePartInfo.getCompanyId());
|
task.setCompanyId(purchasePartInfo.getCompanyId());
|
||||||
task.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
// 创建任务信息
|
// 创建任务信息
|
||||||
res = taskMapper.insertTmTask(task);
|
res = taskMapper.insertTmTask(task);
|
||||||
if (res == 0) {
|
if (res == 0) {
|
||||||
throw new RuntimeException("新增失败,创建任务未成功");
|
throw new RuntimeException("新增失败,创建任务未成功");
|
||||||
}
|
}
|
||||||
purchasePartInfo.setTaskId(task.getTaskId());
|
purchasePartInfo.setTaskId(task.getTaskId());
|
||||||
purchasePartInfo.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
purchasePartInfo.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
purchasePartInfo.setCreateTime(DateUtils.getNowDate());
|
purchasePartInfo.setCreateTime(DateUtils.getNowDate());
|
||||||
// 批量新增新购任务详情信息
|
// 批量新增新购任务详情信息
|
||||||
List<PurchasePartDetails> partDetailsList = purchasePartInfo.getPartDetailsList();
|
List<PurchasePartDetails> partDetailsList = purchasePartInfo.getPartDetailsList();
|
||||||
if (partDetailsList != null) {
|
if (partDetailsList != null) {
|
||||||
for (PurchasePartDetails purchasePartDetails : partDetailsList) {
|
for (PurchasePartDetails purchasePartDetails : partDetailsList) {
|
||||||
purchasePartDetails.setTaskId(task.getTaskId());
|
purchasePartDetails.setTaskId(task.getTaskId());
|
||||||
purchasePartDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
purchasePartDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
purchasePartDetails.setCreateTime(DateUtils.getNowDate());
|
purchasePartDetails.setCreateTime(DateUtils.getNowDate());
|
||||||
}
|
}
|
||||||
res = purchaseAccessoryMapper.insertPurchasePartDetailsList(partDetailsList);
|
res = purchaseAccessoryMapper.insertPurchasePartDetailsList(partDetailsList);
|
||||||
|
|
@ -127,7 +127,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService
|
||||||
}
|
}
|
||||||
for (PurchasePartDetails purchasePartDetails : partDetailsList) {
|
for (PurchasePartDetails purchasePartDetails : partDetailsList) {
|
||||||
purchasePartDetails.setTaskId(taskId);
|
purchasePartDetails.setTaskId(taskId);
|
||||||
purchasePartDetails.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
purchasePartDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
purchasePartDetails.setUpdateTime(DateUtils.getNowDate());
|
purchasePartDetails.setUpdateTime(DateUtils.getNowDate());
|
||||||
}
|
}
|
||||||
// 添加任务详情信息
|
// 添加任务详情信息
|
||||||
|
|
@ -136,7 +136,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService
|
||||||
throw new RuntimeException("修改失败,添加详情信息未成功");
|
throw new RuntimeException("修改失败,添加详情信息未成功");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
purchasePartInfo.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
purchasePartInfo.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
purchasePartInfo.setUpdateTime(DateUtils.getNowDate());
|
purchasePartInfo.setUpdateTime(DateUtils.getNowDate());
|
||||||
res = purchaseAccessoryMapper.updatePurchasePartInfo(purchasePartInfo);
|
res = purchaseAccessoryMapper.updatePurchasePartInfo(purchasePartInfo);
|
||||||
if (res == 0) {
|
if (res == 0) {
|
||||||
|
|
@ -203,7 +203,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService
|
||||||
TmTask task = new TmTask();
|
TmTask task = new TmTask();
|
||||||
task.setTaskId(taskId);
|
task.setTaskId(taskId);
|
||||||
task.setTaskStatus(69);
|
task.setTaskStatus(69);
|
||||||
task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
task.setUpdateTime(DateUtils.getNowDate());
|
task.setUpdateTime(DateUtils.getNowDate());
|
||||||
res = taskMapper.updateTmTask(task);
|
res = taskMapper.updateTmTask(task);
|
||||||
if (res == 0) {
|
if (res == 0) {
|
||||||
|
|
@ -240,7 +240,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService
|
||||||
partDetails.setInputNum(partDetails.getCheckNum());
|
partDetails.setInputNum(partDetails.getCheckNum());
|
||||||
partDetails.setInputTime(String.valueOf(DateUtils.getNowDate()));
|
partDetails.setInputTime(String.valueOf(DateUtils.getNowDate()));
|
||||||
|
|
||||||
partDetails.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
partDetails.setUpdateTime(DateUtils.getNowDate());
|
partDetails.setUpdateTime(DateUtils.getNowDate());
|
||||||
//查询该任务是否已审核
|
//查询该任务是否已审核
|
||||||
res = purchaseAccessoryMapper.setlectStatusById(partDetails.getId());
|
res = purchaseAccessoryMapper.setlectStatusById(partDetails.getId());
|
||||||
|
|
@ -268,7 +268,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService
|
||||||
TmTask task = new TmTask();
|
TmTask task = new TmTask();
|
||||||
task.setTaskId(taskId);
|
task.setTaskId(taskId);
|
||||||
task.setTaskStatus(70);
|
task.setTaskStatus(70);
|
||||||
task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
task.setUpdateTime(DateUtils.getNowDate());
|
task.setUpdateTime(DateUtils.getNowDate());
|
||||||
res = taskMapper.updateTmTask(task);
|
res = taskMapper.updateTmTask(task);
|
||||||
if (res == 0) {
|
if (res == 0) {
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
|
||||||
TmTask task = new TmTask();
|
TmTask task = new TmTask();
|
||||||
task.setTaskId(taskId);
|
task.setTaskId(taskId);
|
||||||
task.setTaskStatus(26);
|
task.setTaskStatus(26);
|
||||||
task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
task.setUpdateTime(DateUtils.getNowDate());
|
task.setUpdateTime(DateUtils.getNowDate());
|
||||||
taskMapper.updateTmTask(task);
|
taskMapper.updateTmTask(task);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
|
||||||
task.setCode(purchaseCodeRule());
|
task.setCode(purchaseCodeRule());
|
||||||
task.setCreateTime(DateUtils.getNowDate());
|
task.setCreateTime(DateUtils.getNowDate());
|
||||||
task.setCompanyId(purchaseCheckInfo.getCompanyId());
|
task.setCompanyId(purchaseCheckInfo.getCompanyId());
|
||||||
task.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
// 创建任务信息
|
// 创建任务信息
|
||||||
taskMapper.insertTmTask(task);
|
taskMapper.insertTmTask(task);
|
||||||
purchaseCheckInfo.setTaskId(task.getTaskId());
|
purchaseCheckInfo.setTaskId(task.getTaskId());
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
|
||||||
maLabelBind.setTypeId(typeId);
|
maLabelBind.setTypeId(typeId);
|
||||||
maLabelBind.setBindTime(new Date());
|
maLabelBind.setBindTime(new Date());
|
||||||
maLabelBind.setLabelType(9);
|
maLabelBind.setLabelType(9);
|
||||||
maLabelBind.setBinder(SecurityUtils.getUserId().toString());
|
maLabelBind.setBinder(SecurityUtils.getLoginUser().getUserid().toString());
|
||||||
purchaseMacodeInfoMapper.insertMaLabelBind(maLabelBind);
|
purchaseMacodeInfoMapper.insertMaLabelBind(maLabelBind);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -328,7 +328,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
|
||||||
TmTask task = new TmTask();
|
TmTask task = new TmTask();
|
||||||
task.setTaskId(taskId);
|
task.setTaskId(taskId);
|
||||||
task.setTaskStatus(28);
|
task.setTaskStatus(28);
|
||||||
task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
task.setUpdateTime(DateUtils.getNowDate());
|
task.setUpdateTime(DateUtils.getNowDate());
|
||||||
taskMapper.updateTmTask(task);
|
taskMapper.updateTmTask(task);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -221,7 +221,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
repairInputDetails.setTypeId(inputDetails.getTypeId());
|
repairInputDetails.setTypeId(inputDetails.getTypeId());
|
||||||
repairInputDetails.setMaId(inputDetails.getMaId());
|
repairInputDetails.setMaId(inputDetails.getMaId());
|
||||||
repairInputDetails.setStatus("0");
|
repairInputDetails.setStatus("0");
|
||||||
repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
repairInputDetails.setCreateTime(new Date());
|
repairInputDetails.setCreateTime(new Date());
|
||||||
repairTestInputMapper.insertRepairInputDetails(repairInputDetails);
|
repairTestInputMapper.insertRepairInputDetails(repairInputDetails);
|
||||||
}
|
}
|
||||||
|
|
@ -250,7 +250,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
scrapApplyDetails.setScrapSource("2");
|
scrapApplyDetails.setScrapSource("2");
|
||||||
scrapApplyDetails.setStatus("0");
|
scrapApplyDetails.setStatus("0");
|
||||||
scrapApplyDetails.setParentId(scrapDetails.getId());
|
scrapApplyDetails.setParentId(scrapDetails.getId());
|
||||||
scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
scrapApplyDetails.setCreateTime(new Date());
|
scrapApplyDetails.setCreateTime(new Date());
|
||||||
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
|
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
|
||||||
}
|
}
|
||||||
|
|
@ -270,7 +270,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
task1.setTaskStatus(47);
|
task1.setTaskStatus(47);
|
||||||
}
|
}
|
||||||
task1.setUpdateTime(new Date());
|
task1.setUpdateTime(new Date());
|
||||||
task1.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task1.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
taskMapper.updateTmTask(task1);
|
taskMapper.updateTmTask(task1);
|
||||||
} else {
|
} else {
|
||||||
status = "2";
|
status = "2";
|
||||||
|
|
@ -299,7 +299,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
int i = repairNum.intValue(); // 直接转换
|
int i = repairNum.intValue(); // 直接转换
|
||||||
repairTaskDetails.setRepairNum(i);
|
repairTaskDetails.setRepairNum(i);
|
||||||
repairTaskDetails.setStatus("0");
|
repairTaskDetails.setStatus("0");
|
||||||
repairTaskDetails.setCreateBy(SecurityUtils.getUserId());
|
repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid());
|
||||||
repairTaskDetails.setCompanyId((long) companyId);
|
repairTaskDetails.setCompanyId((long) companyId);
|
||||||
repairTaskDetails.setBackId(backId);
|
repairTaskDetails.setBackId(backId);
|
||||||
repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails);
|
repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails);
|
||||||
|
|
@ -314,20 +314,20 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
tmTask.setTaskStatus(48);
|
tmTask.setTaskStatus(48);
|
||||||
}
|
}
|
||||||
tmTask.setUpdateTime(new Date());
|
tmTask.setUpdateTime(new Date());
|
||||||
tmTask.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
tmTask.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
taskMapper.updateTmTask(tmTask);
|
taskMapper.updateTmTask(tmTask);
|
||||||
}
|
}
|
||||||
if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
|
if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
|
||||||
if (auditDetailList != null) {
|
if (auditDetailList != null) {
|
||||||
for (RepairAuditDetails bean : auditDetailList){
|
for (RepairAuditDetails bean : auditDetailList){
|
||||||
bean.setAuditBy(SecurityUtils.getUserId());
|
bean.setAuditBy(SecurityUtils.getLoginUser().getUserid());
|
||||||
bean.setStatus(status);
|
bean.setStatus(status);
|
||||||
repairAuditDetailsMapper.updateStatus(bean);
|
repairAuditDetailsMapper.updateStatus(bean);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
for (RepairAuditDetails bean : auditAllList){
|
for (RepairAuditDetails bean : auditAllList){
|
||||||
bean.setAuditBy(SecurityUtils.getUserId());
|
bean.setAuditBy(SecurityUtils.getLoginUser().getUserid());
|
||||||
bean.setStatus(status);
|
bean.setStatus(status);
|
||||||
repairAuditDetailsMapper.updateStatus(bean);
|
repairAuditDetailsMapper.updateStatus(bean);
|
||||||
}
|
}
|
||||||
|
|
@ -343,7 +343,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
task.setTaskType(taskType);
|
task.setTaskType(taskType);
|
||||||
task.setCompanyId(companyId);
|
task.setCompanyId(companyId);
|
||||||
task.setCreateTime(new Date());
|
task.setCreateTime(new Date());
|
||||||
task.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
taskMapper.insertTmTask(task);
|
taskMapper.insertTmTask(task);
|
||||||
// 添加协议信息表
|
// 添加协议信息表
|
||||||
TmTaskAgreement taskAgreement = new TmTaskAgreement();
|
TmTaskAgreement taskAgreement = new TmTaskAgreement();
|
||||||
|
|
@ -354,7 +354,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
||||||
}else {
|
}else {
|
||||||
taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId());
|
taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId());
|
||||||
}
|
}
|
||||||
taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
agreementMapper.insertTmTaskAgreement(taskAgreement);
|
agreementMapper.insertTmTaskAgreement(taskAgreement);
|
||||||
return taskId;
|
return taskId;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService
|
||||||
task.setRemark(scrapAudit.getRemark());
|
task.setRemark(scrapAudit.getRemark());
|
||||||
}
|
}
|
||||||
task.setUpdateTime(new Date());
|
task.setUpdateTime(new Date());
|
||||||
task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
|
task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||||
taskMapper.updateTmTask(task);
|
taskMapper.updateTmTask(task);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ public class SysFileServiceImpl implements SysFileService {
|
||||||
StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request;
|
StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request;
|
||||||
String photoType = req.getParameter("fileType");
|
String photoType = req.getParameter("fileType");
|
||||||
// String userId = req.getParameter("userId");
|
// String userId = req.getParameter("userId");
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||||
HashMap<String, Object> map = getFile(req);
|
HashMap<String, Object> map = getFile(req);
|
||||||
List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
|
List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
|
||||||
MultipartFile item = items.get(0);
|
MultipartFile item = items.get(0);
|
||||||
|
|
@ -66,7 +66,7 @@ public class SysFileServiceImpl implements SysFileService {
|
||||||
file.setType(type);
|
file.setType(type);
|
||||||
file.setSize(size + "M");
|
file.setSize(size + "M");
|
||||||
file.setWords(words);
|
file.setWords(words);
|
||||||
file.setCreateBy(SecurityUtils.getUserId().toString());
|
file.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
|
||||||
file.setCreateTime(new Date());
|
file.setCreateTime(new Date());
|
||||||
dao.insertFileInfo(file);
|
dao.insertFileInfo(file);
|
||||||
}
|
}
|
||||||
|
|
@ -85,7 +85,7 @@ public class SysFileServiceImpl implements SysFileService {
|
||||||
@Override
|
@Override
|
||||||
public FileInfo uploadHeadPic(MultipartFile item,String fileType) {
|
public FileInfo uploadHeadPic(MultipartFile item,String fileType) {
|
||||||
FileInfo file = new FileInfo();
|
FileInfo file = new FileInfo();
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getLoginUser().getUserid();
|
||||||
try {
|
try {
|
||||||
String url = saveFilePic(item, fileType);
|
String url = saveFilePic(item, fileType);
|
||||||
if (url != null) {
|
if (url != null) {
|
||||||
|
|
@ -99,7 +99,7 @@ public class SysFileServiceImpl implements SysFileService {
|
||||||
file.setType(type);
|
file.setType(type);
|
||||||
file.setSize(size + "M");
|
file.setSize(size + "M");
|
||||||
file.setWords(words);
|
file.setWords(words);
|
||||||
file.setCreateBy(SecurityUtils.getUserId().toString());
|
file.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
|
||||||
file.setCreateTime(new Date());
|
file.setCreateTime(new Date());
|
||||||
dao.insertFileInfo(file);
|
dao.insertFileInfo(file);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue