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

This commit is contained in:
zhangshilin
2018-03-17 17:09:33 +08:00
22 changed files with 168 additions and 101 deletions

View File

@@ -63,6 +63,7 @@ public class TaskInfoService extends BaseService{
for (int i = 0; i < exId.length; i++) {
taskInfo.setId(Long.valueOf(exId[i]));
taskInfo.setIsAudit(1);//审核通过
taskInfo.setIsValid(1);//审核通过
taskInfo.setAuditTime(new Date());
taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
taskInfoDao.update(taskInfo);
@@ -85,6 +86,7 @@ public class TaskInfoService extends BaseService{
for (int i = 0; i < cancelId.length; i++) {
taskInfo.setId(Long.valueOf(cancelId[i]));
taskInfo.setIsAudit(3);//取消审核通过
taskInfo.setIsValid(0);
taskInfo.setAuditTime(new Date());
taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
taskInfoDao.update(taskInfo);

View File

@@ -67,6 +67,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 +90,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);

View File

@@ -1,5 +1,7 @@
package com.nis.web.service.systemService;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,4 +15,7 @@ public class ServiceConfigInfoService {
public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){
return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId);
}
public List<ServiceConfigInfo> findList(int serviceId){
return serviceConfigInfoDao.findList(serviceId);
}
}