审计代码修改
This commit is contained in:
parent
04131d8524
commit
468a1e7635
|
|
@ -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()) {
|
||||||
|
|
|
||||||
|
|
@ -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,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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue