gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangxin
2018-03-12 16:35:08 +08:00
parent 2df9aa9665 0dfba79e68
commit 4e0c54421f
10 changed files with 319 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/nis/domain/configuration/RequestInfo.java
View File

@@ -39,11 +39,13 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
private String creatorName;
private String editorName;
private String auditorName;
private Date beginDate;//开始时间
private Date endDate;//结束时间
private Date beginDate;//来函开始时间
private Date endDate;//来函结束时间
private String timeType;//时间类型
private String taskName;//专项任务
private String seltype;//选中类型
private Date dobeginDate;//操作开始时间
private Date doendDate;//操作结束时间
public Long getTaskId() {
return taskId;
@@ -212,5 +214,29 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
public void setTaskName(String taskName) {
this.taskName = taskName;
}
public String getSeltype() {
return seltype;
}
public void setSeltype(String seltype) {
this.seltype = seltype;
}
public Date getDobeginDate() {
return dobeginDate;
}
public void setDobeginDate(Date dobeginDate) {
this.dobeginDate = dobeginDate;
}
public Date getDoendDate() {
return doendDate;
}
public void setDoendDate(Date doendDate) {
this.doendDate = doendDate;
}
}

21
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -101,8 +101,9 @@ public class RequestInfoController extends BaseController{
* @return
*/
@RequestMapping(value = "requestExamine")
public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
requestInfoService.requestExamine(requestInfo);
public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(",");
requestInfoService.requestExamine(exId);
addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
@@ -114,8 +115,9 @@ public class RequestInfoController extends BaseController{
* @return
*/
@RequestMapping(value = "requestExamineNo")
public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
requestInfoService.requestExamineNo(requestInfo);
public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(",");
requestInfoService.requestExamineNo(noId);
addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
@@ -127,8 +129,9 @@ public class RequestInfoController extends BaseController{
* @return
*/
@RequestMapping(value = "requestCancelExamine")
public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
requestInfoService.requestCancelExamine(requestInfo);
public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(",");
requestInfoService.requestCancelExamine(canclelId);
addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
@@ -140,8 +143,9 @@ public class RequestInfoController extends BaseController{
* @return
*/
@RequestMapping(value = "delete")
public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
requestInfoService.delete(requestInfo);
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(",");
requestInfoService.delete(delId);
addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
@@ -156,4 +160,5 @@ public class RequestInfoController extends BaseController{
List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
model.addAttribute("taskInfos", taskInfos);
}
}

1
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
View File

@@ -23,6 +23,7 @@ public interface RequestInfoDao extends CrudDao {
List<TaskInfo> showTask(TaskInfo taskInfo);
void delete(@Param("id") Long id);
}

12
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -61,11 +61,11 @@
<if test="isAudit != null">
AND r.is_audit=${isAudit}
</if>
<if test=" timeType == 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="timeType == 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
</if>
order by r.request_time desc
</select>
@@ -153,11 +153,11 @@
where id = #{id,jdbcType=BIGINT}
</update>
<!--删除 -->
<update id="delete" parameterType="com.nis.domain.configuration.RequestInfo">
<update id="delete" parameterType="long">
update request_info
<set>
<if test="isValid != null and id != null">
is_valid=#{isValid}
<if test="id != null and id != ''">
is_valid=-1
</if>
</set>
where id = #{id,jdbcType=BIGINT} and is_audit !=1

37
src/main/java/com/nis/web/service/configuration/RequestInfoService.java
View File

@@ -62,24 +62,37 @@ public class RequestInfoService extends BaseService{
return requestInfoDao.getRequestInfoById(id);
}
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void requestExamine(RequestInfo requestInfo){
requestInfo.setIsAudit(1);//审核通过
requestInfoDao.update(requestInfo);
public void requestExamine(String[] exId){
RequestInfo requestInfo = new RequestInfo();
for (int i = 0; i < exId.length; i++) {
requestInfo.setId(Long.valueOf(exId[i]));
requestInfo.setIsAudit(1);//审核通过
requestInfoDao.update(requestInfo);
}
}
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void requestExamineNo(RequestInfo requestInfo){
requestInfo.setIsAudit(2);//审核未通过
requestInfoDao.update(requestInfo);
public void requestExamineNo(String[] noId){
RequestInfo requestInfo = new RequestInfo();
for (int i = 0; i < noId.length; i++) {
requestInfo.setId(Long.valueOf(noId[i]));
requestInfo.setIsAudit(2);//审核未通过
requestInfoDao.update(requestInfo);
}
}
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void requestCancelExamine(RequestInfo requestInfo){
requestInfo.setIsAudit(3);//取消审核通过
int update = requestInfoDao.update(requestInfo);
public void requestCancelExamine(String[] cancelId){
RequestInfo requestInfo = new RequestInfo();
for (int i = 0; i < cancelId.length; i++) {
requestInfo.setId(Long.valueOf(cancelId[i]));
requestInfo.setIsAudit(3);//取消审核通过
requestInfoDao.update(requestInfo);
}
}
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void delete(RequestInfo requestInfo){
requestInfo.setIsValid(-1);
requestInfoDao.delete(requestInfo);//删除
public void delete(String[] delId){
for (int i = 0; i < delId.length; i++) {
requestInfoDao.delete(Long.valueOf(delId[i]));//删除
}
}
public List<RequestInfo> getValidRequestInfo(){
RequestInfo requestInfo=new RequestInfo();