1.修复发送短信条件,没有待办也发送信息。

2.业务管理添加受理中

src/main/groovy/com/jd/brume/controller/ServiceController.groovy

@@ -1,5 +1,7 @@
 package com.jd.brume.controller
 
+import com.alibaba.fastjson.JSON
+
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
@@ -188,7 +190,12 @@ class ServiceController {
 				}
 			}
 			String sms = templet.replace("{user}", serviceEntity.sqrxm).replace("{area}", String.valueOf(qxbm))
-			boolean flag = SmsUtil.sendSms(String.valueOf(config.get("sms_url")), serviceEntity.sqrlxdh, sms)
+			boolean flag = false;
+			try {
+				flag = SmsUtil.sendSms(String.valueOf(config.get("sms_url")), serviceEntity.sqrlxdh, sms)
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 			SmsRecordEntity recordEntity = new SmsRecordEntity(type: 1, content: sms, phone: serviceEntity.sqrlxdh,
 				status: flag ? 0 : 1, serviceId: id, serviceType: corp.type)
 			smsRecordService.save(recordEntity)

src/main/groovy/com/jd/brume/task/ServiceTask.java

@@ -69,6 +69,7 @@ class ServiceTask implements SchedulingConfigurer {
 				System.err.println("发送短信");
 				List<SmsEntity> list = smsService.lambdaQuery().eq(SmsEntity::getStatus, 0).list();
 				if (list == null || list.size() == 0) {
+					System.out.println("未发现短信发送用户");
 					return;
 				}
 				List<Integer> userIds = new ArrayList<>();
@@ -96,6 +97,10 @@ class ServiceTask implements SchedulingConfigurer {
 					}
 
 					Integer num = service.getServiceByType(corp.getDeptPrefix(), corp.getType());
+					if(num == 0){
+						System.out.println(userEntity.getPhone()+"没有待办事项，不需要发送短信");
+						continue;
+					}
 					String sms = templet.replace("{user}", userEntity.getUserName()).replace("{number}", String.valueOf(num));
 					// 发送短信
 					boolean status = SmsUtil.sendSms(String.valueOf(config.get("sms_url")), userEntity.getPhone(), sms);

src/main/resources/mapper/MenuMapper.xml

@@ -18,5 +18,6 @@
 		FROM `t_role_menu` trm
 		    LEFT JOIN t_menu tm ON tm.menu_id = trm.menu_id
 		    WHERE trm.role_id = #{roleId}
+		order by tm.menu_sort
 	</select>
 </mapper>

src/main/resources/mapper/ServiceMapper.xml

@@ -10,9 +10,13 @@
 			LEFT JOIN  t_service ts ON ts.id = tsr.service_id
 			<where>
 				<if test="queryType == 1">
-					AND (tsr.`completion` is null or tsr.`completion` = 0)
+					AND (tsr.case_status is null or tsr.case_status = 0)
 				</if>
 				<if test="queryType == 2">
+					AND tsr.case_status = 1
+					AND (tsr.`completion` is null or tsr.`completion` = 0)
+				</if>
+				<if test="queryType == 3">
 					AND tsr.`completion` = 1
 				</if>
 				<if test="type != null and type != 4">
@@ -71,9 +75,13 @@
 			LEFT JOIN t_service ts ON ts.id = tsr.service_id
 			<where>
 				<if test="queryType == 1">
-					AND (tsr.`completion` is null or tsr.`completion` = 0)
+					AND (tsr.case_status is null or tsr.case_status = 0)
 				</if>
 				<if test="queryType == 2">
+					AND tsr.case_status = 1
+					AND (tsr.`completion` is null or tsr.`completion` = 0)
+				</if>
+				<if test="queryType == 3">
 					AND tsr.`completion` = 1
 				</if>
 				<if test="type != null and type != 4">

src/main/resources/static/web/js/api/dealt.api.js

@@ -38,42 +38,6 @@ layui.define(['jquery', 'ajax', 'layer', 'constants'], (exports) => {
 				}
 			})
 		},
-		one: (deptId, fun) => {
-			ajax.get({
-				url: '/corp/one',
-				data: {deptId},
-				success: (json) => {
-					fun(json)
-				}
-			})
-		},
-		delete: (deptId, fun) => {
-			ajax.delete({
-				url: '/corp/delete',
-				data: {deptId},
-				success: (json) => {
-					fun(json)
-				}
-			})
-		},
-		save: (data, fun) => {
-			ajax.post({
-				url: '/corp/save',
-				data,
-				success: (json) => {
-					fun(json)
-				}
-			})
-		},
-		update: (data, fun) => {
-			ajax.post({
-				url: '/corp/update',
-				data,
-				success: (json) => {
-					fun(json)
-				}
-			})
-		},
 		download: (id, serviceId) => {
 			const index = layui.layer.load(0);
 			let xhr = new XMLHttpRequest();

src/main/resources/static/web/js/dealt.js

@@ -46,43 +46,13 @@ const initTable = (result) => {
 			// 	}
 			// }},
 			{field: 'hh', title: '户号'},
-			{title: '是否受理', templet: (res) => {
-				let color, txt = '未受理'
-				if (res.case_status == 1) {
-					color = '#5FB878'
-					txt = '已受理'
-				}
-				return `<span style="color:${color};">${txt}</span>`
-			}},
-			{title: '补齐补证', templet: (res) => {
-				let color, txt = ''
-				if (res.use_status == 1) {
-					color = '#5FB878'
-					txt = '已补齐补证'
-				}
-				return `<span style="color:${color};">${txt}</span>`
-			}},
 			{title: '申请时间', templet: (res) => {
 				return new Date(res.sqsj).format('yyyy-MM-dd hh:mm:ss')
 			}},
-			{title: '受理时间', templet: (res) => {
-				if (res.case_time==null){
-					return "-"
-				}
-				return new Date(res.case_time).format('yyyy-MM-dd hh:mm:ss')
-			}},
 			{title: '操作', width: 300, templet: (d) => {
 				let html = '<span class="fast-span" lay-event="detail">详情</span>'
 					if (result.type!=4){
-						if(!d.case_status || d.case_status == 0) {
-							html += '<span class="fast-span" lay-event="caseEvent">受理</span>'
-						}
-						if(d.case_status && d.case_status != 0 && (!d.use_status || d.use_status == 0)) {
-							html += '<span class="fast-span" lay-event="useEvent">补齐补证</span>'
-						}
-						if(d.case_status && d.case_status != 0) {
-							html += '<span class="fast-span" lay-event="cEvent">办结</span>'
-						}
+						html += '<span class="fast-span" lay-event="caseEvent">受理</span>'
 					}
 				html += '<span class="fast-span" lay-event="download">下载资料</span>'
 				return html
@@ -101,13 +71,7 @@ const initClick = (result) => {
 	for (let i = 0; i < result.qxbm.length; i++) {
 		qxbmObj[result.qxbm[i].dictCut] = result.qxbm[i].dictVal
 	}
-	/*$('.brume-main').on('click', '#addBtn', () => {
-		$('#form-title').text('新增')
-		layui.form.val('form', {
-			id: '',
-		})
-		layui.customUtil.autoView('.brume-main', '.brume-form')
-	})*/
+
 	$('.brume-form').on('click', '#back', () => {
 		layui.customUtil.autoView('.brume-main', '.brume-form')
 	})
@@ -117,23 +81,6 @@ const initClick = (result) => {
 			page: { curr: 1 }
 		})
 	})
-	layui.form.on('submit(formBtn)', (data) => {
-		layui.layer.confirm('确认要受理吗？', {
-			btn: ['受理', '取消']
-		}, (index) => {
-			layui.api.case(data.field.id, 
-				(json) => {
-					if (json.code == layui.constants.SUCCESS_CODE) {
-						layui.customUtil.autoView('.brume-main', '.brume-form')
-						layui.customUtil.refush(json.result, '受理成功', '受理失败')
-					} else {
-						layui.layer.msg(json.msg, {icon: 5})
-					}
-				}
-			)
-		})
-		return false
-	})
 	
 	layui.table.on('tool(table)', function(obj) {
 		if (obj.event == 'detail') {
@@ -157,61 +104,24 @@ const initClick = (result) => {
 				sqsj: new Date(obj.data.sqsj).format('yyyy-MM-dd hh:mm:ss'),
 			})
 			layui.customUtil.autoView('.brume-main', '.brume-form')
-			$("#saveBtn").hide();
 
 		} else if (obj.event == 'caseEvent') {
-			let sqrhh;
-			if (result.type == 1) {
-				sqrhh = obj.data.gshh
-			} else if (result.type == 2) {
-				sqrhh = obj.data.gdhh
-			} else {
-				sqrhh = obj.data.gqhh
-			}
-			layui.form.val('form', {
-				id: obj.data.id,
-				data_id: obj.data.data_id,
-				sqrxm: obj.data.sqrxm,
-				sqrzjhm: obj.data.sqrzjhm,
-				sqrlxdh: obj.data.sqrlxdh,
-				type: sortObj[result.type],
-				qxbm: qxbmObj[obj.data.qxbm],
-				sqrhh: sqrhh,
-				sqsj: new Date(obj.data.sqsj).format('yyyy-MM-dd hh:mm:ss'),
-			})
-			layui.customUtil.autoView('.brume-main', '.brume-form')
-			$("#saveBtn").show();
-		} else if (obj.event == 'download') {
-			console.log(obj.data)
-			layui.api.download(obj.data.id, obj.data.data_id)
-		} else if (obj.event == 'useEvent') {
-			layui.layer.confirm('确认要补齐补证吗？', {
-				btn: ['补齐补证', '取消']
+			layui.layer.confirm('确认要受理吗？', {
+				btn: ['受理', '取消']
 			}, (index) => {
-				layui.api.use(obj.data.id, 
+				layui.api.case(obj.data.id,
 					(json) => {
 						if (json.code == layui.constants.SUCCESS_CODE) {
-							layui.customUtil.refush(json.result, '补齐补证成功', '补齐补证失败')
-						} else {
-							layui.layer.msg(json.msg, {icon: 5})
-						}
-					}
-				)
-			})
-		} else if (obj.event == 'cEvent') {
-			layui.layer.confirm('确认要办结吗？', {
-				btn: ['办结', '取消']
-			}, (index) => {
-				layui.api.completion(obj.data.id, 
-					(json) => {
-						if (json.code == layui.constants.SUCCESS_CODE) {
-							layui.customUtil.refush(json.result, '办结成功', '办结失败')
+							layui.customUtil.refush(json.result, '受理成功', '受理失败')
 						} else {
 							layui.layer.msg(json.msg, {icon: 5})
 						}
 					}
 				)
 			})
+		} else if (obj.event == 'download') {
+			console.log(obj.data)
+			layui.api.download(obj.data.id, obj.data.data_id)
 		}
 	})
 }

src/main/resources/static/web/js/done.js

@@ -30,7 +30,7 @@ const initTable = (result) => {
 	}
 	layui.customUtil.table({
 		elem: '#table',
-		url: '/service/paging?queryType=2',
+		url: '/service/paging?queryType=3',
 		cols: [[
 			{type: 'numbers', title: '序号'},
 			{ title: '区县', templet: (res) => {

src/main/resources/static/web/js/process.js

@@ -0,0 +1,166 @@
+layui.config({
+  base: '../js/module/'
+}).extend({
+	'constants': '{/}../js/util/constants',
+	'ajax': '{/}../js/util/ajax',
+	'customUtil': '{/}../js/util/util',
+	'api': '{/}../js/api/dealt.api'
+}).use(['jquery', 'layer', 'form', 'api', 'constants', 'customUtil'], () => {
+	layui.api.init((json) => {
+		
+		initTable(json.result)
+		initClick(json.result)
+	})
+})
+
+const initTable = (result) => {
+	let sortObj = {}
+	for (let i = 0; i < result.sort.length; i++) {
+		sortObj[result.sort[i].dictCut] = result.sort[i].dictVal
+	}
+	let qxbmObj = {}
+	for (let i = 0; i < result.qxbm.length; i++) {
+		qxbmObj[result.qxbm[i].dictCut] = result.qxbm[i].dictVal
+	}
+	layui.customUtil.table({
+		elem: '#table',
+		url: '/service/paging?queryType=2',
+		cols: [[
+			{type: 'numbers', title: '序号'},
+			{ title: '区县', templet: (res) => {
+				return qxbmObj[res.qxbm]
+			}},
+			{field: 'sqrxm', title: '申请人姓名'},
+			{field: 'sqrzjhm', title: '证件号'},
+			{field: 'sqrlxdh', title: '电话号码'},
+			{title: '类别', templet: (res) => {
+				return sortObj[res.type]
+			}},
+			// {title: '户号', templet: (res) => {
+			// 	if (result.type == 1) {
+			// 		return res.gshh
+			// 	} else if (result.type == 2) {
+			// 		return res.gdhh
+			// 	} else {
+			// 		return res.gqhh
+			// 	}
+			// }},
+			{field: 'hh', title: '户号'},
+			{title: '补齐补证', templet: (res) => {
+				let color, txt = ''
+				if (res.use_status == 1) {
+					color = '#5FB878'
+					txt = '已补齐补证'
+				}
+				return `<span style="color:${color};">${txt}</span>`
+			}},
+			{title: '申请时间', templet: (res) => {
+				return new Date(res.sqsj).format('yyyy-MM-dd hh:mm:ss')
+			}},
+			{title: '受理时间', templet: (res) => {
+				if (res.case_time==null){
+					return "-"
+				}
+				return new Date(res.case_time).format('yyyy-MM-dd hh:mm:ss')
+			}},
+			{title: '操作', width: 300, templet: (d) => {
+				let html = '<span class="fast-span" lay-event="detail">详情</span>'
+					if (result.type!=4){
+						if(!d.use_status || d.use_status == 0) {
+							html += '<span class="fast-span" lay-event="useEvent">补齐补证</span>'
+						}
+						html += '<span class="fast-span" lay-event="cEvent">办结</span>'
+					}
+				html += '<span class="fast-span" lay-event="download">下载资料</span>'
+				return html
+			}}
+		]]
+	})
+}
+
+const initClick = (result) => {
+	const $ = layui.jquery
+	let sortObj = {}
+	for (let i = 0; i < result.sort.length; i++) {
+		sortObj[result.sort[i].dictCut] = result.sort[i].dictVal
+	}
+	let qxbmObj = {}
+	for (let i = 0; i < result.qxbm.length; i++) {
+		qxbmObj[result.qxbm[i].dictCut] = result.qxbm[i].dictVal
+	}
+	/*$('.brume-main').on('click', '#addBtn', () => {
+		$('#form-title').text('新增')
+		layui.form.val('form', {
+			id: '',
+		})
+		layui.customUtil.autoView('.brume-main', '.brume-form')
+	})*/
+	$('.brume-form').on('click', '#back', () => {
+		layui.customUtil.autoView('.brume-main', '.brume-form')
+	})
+	$('.brume-main').on('click', '.search', () => {
+		layui.table.reload('table', {
+			where: {queryVal: $('input[name="search"]').val()},
+			page: { curr: 1 }
+		})
+	})
+	
+	layui.table.on('tool(table)', function(obj) {
+		if (obj.event == 'detail') {
+			let sqrhh;
+			if (result.type == 1) {
+				sqrhh = obj.data.gshh
+			} else if (result.type == 2) {
+				sqrhh = obj.data.gdhh
+			} else {
+				sqrhh = obj.data.gqhh
+			}
+			layui.form.val('form', {
+				id: obj.data.id,
+				data_id: obj.data.data_id,
+				sqrxm: obj.data.sqrxm,
+				sqrzjhm: obj.data.sqrzjhm,
+				sqrlxdh: obj.data.sqrlxdh,
+				type: sortObj[result.type],
+				qxbm: qxbmObj[obj.data.qxbm],
+				sqrhh: sqrhh,
+				sqsj: new Date(obj.data.sqsj).format('yyyy-MM-dd hh:mm:ss'),
+				case_time: new Date(obj.data.case_time).format('yyyy-MM-dd hh:mm:ss')
+			})
+			layui.customUtil.autoView('.brume-main', '.brume-form')
+			$("#saveBtn").hide();
+
+		} else if (obj.event == 'download') {
+			console.log(obj.data)
+			layui.api.download(obj.data.id, obj.data.data_id)
+		} else if (obj.event == 'useEvent') {
+			layui.layer.confirm('确认要补齐补证吗？', {
+				btn: ['补齐补证', '取消']
+			}, (index) => {
+				layui.api.use(obj.data.id, 
+					(json) => {
+						if (json.code == layui.constants.SUCCESS_CODE) {
+							layui.customUtil.refush(json.result, '补齐补证成功', '补齐补证失败')
+						} else {
+							layui.layer.msg(json.msg, {icon: 5})
+						}
+					}
+				)
+			})
+		} else if (obj.event == 'cEvent') {
+			layui.layer.confirm('确认要办结吗？', {
+				btn: ['办结', '取消']
+			}, (index) => {
+				layui.api.completion(obj.data.id, 
+					(json) => {
+						if (json.code == layui.constants.SUCCESS_CODE) {
+							layui.customUtil.refush(json.result, '办结成功', '办结失败')
+						} else {
+							layui.layer.msg(json.msg, {icon: 5})
+						}
+					}
+				)
+			})
+		}
+	})
+}

src/main/resources/static/web/js/sms.js

@@ -61,37 +61,13 @@ const initTable = () => {
 			{field: 'user_name', title: '名称'},
 			{field: 'statusName', title: '状态', templet: templet3},
 			{field: 'create_time', title: '创建时间', templet: (d)=>{
-					return dateFormat(d.create_time);
+					return new Date(d.create_time).format('yyyy-MM-dd hh:mm:ss');
 				}},
 			{title: '操作', templet}
 		]]
 	})
 }
 
-const dateFormat = function(value){
-	if (value == '' || value == null) {
-		return '';
-	}
-	var date = new Date(value);
-	var year = date.getFullYear();
-	var month= addZeroFormat(date.getMonth() + 1);
-	var day= addZeroFormat(date.getDate());
-	var hour = addZeroFormat(date.getHours());
-	var minutes = addZeroFormat(date.getMinutes());
-	var second = addZeroFormat(date.getSeconds());
-	return year + '-' + month+ '-' + day+ ' ' + hour + ':' + minutes + ':' + second ;
-}
-const addZeroFormat = function(value){
-	if (value == '' || value == null) {
-		return '';
-	}
-	if(value < 10){
-		value = "0" + value;
-	}
-	return value;
-}
-
-
 const initClick = () => {
 	const $ = layui.jquery
 	$('.brume-main').on('click', '#addBtn', () => {

src/main/resources/static/web/view/dealt.html

@@ -76,7 +76,6 @@
 				</div>
 				<div class="layui-form-item">
 					<div class="layui-input-block">
-						<button id="saveBtn" type="submit" class="layui-btn" lay-submit="" lay-filter="formBtn">受理</button>
 						<button id="back" type="reset" class="layui-btn layui-btn-primary">返回</button>
 					</div>
 				</div>

src/main/resources/static/web/view/done.html

@@ -23,7 +23,7 @@
 		</div>
 		<div class="layui-hide brume-form">
 			<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-				<legend id="form-title">新增</legend>
+				<legend id="form-title">详情</legend>
 			</fieldset>
 			<form class="layui-form fast-form-width" action="" lay-filter="form">
 				<div class="layui-form-item">

src/main/resources/static/web/view/process.html

@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>南岸区水电气过户联动办理-受理中</title>
+		<link rel="stylesheet" href="../js/lib/layui-v2.7.6/layui/css/layui.css" />
+		<link rel="stylesheet" href="../css/main.css" />
+	</head>
+	<body>
+		<div class="brume-main">
+			<div>
+				<div>
+					<div class="layui-input-inline">
+						<input placeholder="请输入姓名/证件号/电话" type="text" name="search" autocomplete="off" class="layui-input">
+					</div>
+					<button type="button" class="layui-btn layui-btn-normal search">
+						<i class="layui-icon layui-icon-search"></i>
+					</button>
+				</div>
+			</div>
+			<table id="table" class="layui-hide" lay-filter="table"></table>
+		</div>
+		<div class="layui-hide brume-form">
+			<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+				<legend id="form-title">详情</legend>
+			</fieldset>
+			<form class="layui-form fast-form-width" action="" lay-filter="form">
+				<input type="hidden" name="id" class="layui-input">
+				<div class="layui-form-item">
+					<label class="layui-form-label">ID</label>
+					<div class="layui-input-block">
+						<input type="text" name="data_id" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">申请人姓名</label>
+					<div class="layui-input-block">
+						<input type="text" name="sqrxm" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">申请人证件</label>
+					<div class="layui-input-block">
+						<input type="text" name="sqrzjhm" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">申请人电话</label>
+					<div class="layui-input-block">
+						<input type="text" name="sqrlxdh" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">区县</label>
+					<div class="layui-input-block">
+						<input type="text" name="qxbm" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">类型</label>
+					<div class="layui-input-block">
+						<input type="text" name="type" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">户号</label>
+					<div class="layui-input-block">
+						<input type="text" name="sqrhh" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">申请时间</label>
+					<div class="layui-input-block">
+						<input type="text" name="sqsj" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label">受理时间</label>
+					<div class="layui-input-block">
+						<input type="text" name="case_time" readonly class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<div class="layui-input-block">
+						<button id="back" type="reset" class="layui-btn layui-btn-primary">返回</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</body>
+	<script src="../js/lib/layui-v2.7.6/layui/layui.js"></script>
+	<script src="../js/process.js"></script>
+</html>