Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
chenjinsong
2018-03-22 14:41:33 +08:00
79 changed files with 5111 additions and 2093 deletions

View File

@@ -40,12 +40,13 @@ public class RequestInfoService extends BaseService{
public void saveOrUpdate(RequestInfo requestInfo) {
if (StringUtil.isEmpty(requestInfo.getId())) {
//设置默认参数值
requestInfo.setIsValid(1);//
requestInfo.setIsValid(0);//
requestInfo.setIsAudit(0);//未审核
requestInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员
requestInfo.setCreateTime(new Date());//创建时间
requestInfoDao.insert(requestInfo);
}else{
requestInfo.setIsAudit(0);//修改后状态为未审核
requestInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员
requestInfo.setEditTime(new Date());//修改时间
requestInfoDao.update(requestInfo);
@@ -67,6 +68,7 @@ public class RequestInfoService extends BaseService{
for (int i = 0; i < exId.length; i++) {
requestInfo.setId(Long.valueOf(exId[i]));
requestInfo.setIsAudit(1);//审核通过
requestInfo.setIsValid(1);//审核通过有效
requestInfo.setAuditTime(new Date());
requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
requestInfoDao.update(requestInfo);
@@ -89,6 +91,7 @@ public class RequestInfoService extends BaseService{
for (int i = 0; i < cancelId.length; i++) {
requestInfo.setId(Long.valueOf(cancelId[i]));
requestInfo.setIsAudit(3);//取消审核通过
requestInfo.setIsValid(0);//取消审核通过无效
requestInfo.setAuditTime(new Date());
requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
requestInfoDao.update(requestInfo);