微信

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -39,9 +39,9 @@ public class TheOrderController extends BaseController {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String userId = "XuShuai";
         WeChatUser weChatUser = new WeChatUser();
-        weChatUser.setName("张三");
+        weChatUser.setName("许帅");
         //回显
-        TheOrder userOrderEcho = getUserOrderEcho("张三");
+        TheOrder userOrderEcho = getUserOrderEcho(userId,"许帅");
         //验证今天是否预定过餐
         //获取工作日 -- 第二天
         String addOrMinusDayString = OrderUtils.getAddOrMinusDayString(1, dateFormat);
@@ -67,7 +67,7 @@ public class TheOrderController extends BaseController {
                 String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
                 String user = AddressBookUtil.getUser(accessToken, userId);
                 String name = getMaps(user);
-                TheOrder userOrderEcho = getUserOrderEcho(name);
+                TheOrder userOrderEcho = getUserOrderEcho(userId,name);
                 //验证今天是否预定过餐
                 //获取工作日 -- 第二天
                 String addOrMinusDayString = OrderUtils.getAddOrMinusDayString(1, dateFormat);
@@ -88,14 +88,14 @@ public class TheOrderController extends BaseController {
     }
 
     //获取部门以及分管领导信息--回显FROM
-    public TheOrder getUserOrderEcho(String name){
+    public TheOrder getUserOrderEcho(String userId,String username){
         TheOrder theOrder = new TheOrder();
         //查询用户
-        User user = theLeadershipService.findUser(name);
-        String userId = user.getId();//获取用户id
+//        User user = theLeadershipService.findUser(name);
+//        String userId = user.getId();//获取用户id
         //获取用户user
         //添加回显对象
-        theOrder.setName(user.getName());//姓名
+        theOrder.setName(username);//姓名
         theOrder.setCorrelationId(userId);//添加用户id
         //查询是否为第一次
         TheLeadership theLeadership = new TheLeadership();

src/main/resources/mappings/modules/wexintheorder/TheLeadershipDao.xml

@@ -104,7 +104,7 @@
 
 
 	<select id="findUser" resultType="com.jeeplus.modules.sys.entity.User">
-		SELECT a.id from sys_user a WHERE a.name = #{name}
+		SELECT a.id,a.name from sys_user a WHERE a.name = #{name}
 	</select>
 	<!-- 根据id查找部门分管领导信息 -->
 	<!--<select id="findUser" resultType="com.jeeplus.modules.sys.entity.User">-->

src/main/webapp/static/wechat/wechat-btn.css

@@ -1,23 +1,13 @@
 		.blue {
 			color: #d9eef7;
-			border: solid 1px #0076a3;
+			/*border: solid 1px #0076a3;*/
+			height: 150px;
+			width:150px;
 			background: #0095cd;
 			background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
 			background: -moz-linear-gradient(top,  #00adee,  #0078a5);
 			filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
 		}
-		.blue:hover {
-			background: #007ead;
-			background: -webkit-gradient(linear, left top, left bottom, from(#0095cc), to(#00678e));
-			background: -moz-linear-gradient(top,  #0095cc,  #00678e);
-			filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0095cc', endColorstr='#00678e');
-		}
-		.blue:active {
-			color: #80bed6;
-			background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee));
-			background: -moz-linear-gradient(top,  #0078a5,  #00adee);
-			filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee');
-		}
 		.button-2 {
 			display: inline-block;
 			outline: none;
@@ -26,22 +16,16 @@
 			text-decoration: none;
 			height: 150px;
 			width:150px;
-			font: 11px/100% 'Microsoft yahei',Arial, Helvetica, sans-serif;
-			padding: .5em 2em .55em;
+			font: 16px/100% 'Microsoft yahei',Arial, Helvetica, sans-serif;
+			/*padding: .5em 2em .55em;*/
 			text-shadow: 0 1px 1px rgba(0,0,0,.3);
-			-webkit-border-radius: .5em;
-			-moz-border-radius: .5em;
+			-webkit-border-radius: 50%;
+			-moz-border-radius: 50%;
 			border-radius: 50%;
 			-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
 			-moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
 			box-shadow: 0 1px 2px rgba(0,0,0,.2);
-		}
-		.button-2:hover {
-			text-decoration: none;
-		}
-		.button-2:active {
-			position: relative;
-			top: 1px;
+			margin: 10px
 		}
 
 

src/main/webapp/webpage/modules/weixin/theorder/orderMeal.jsp

@@ -29,58 +29,69 @@
         height: 20px;
         line-height: 20px;
     }
+    .notclick{
+        pointer-events: none;
+    }
+    .btn_div_list{
+        -webkit-border-radius: 50%;
+        -moz-border-radius: 50%;
+    }
 </style>
 <body>
-    <div style="text-align: center;padding: 10px;">
-        江苏兴光临时订餐系统
-    </div>
-    <%--<div class="weui-cells weui-cells_form">--%>
+        <div style="padding:10px; margin:auto;">
+            <img style="    margin: auto;width: 100%;" src="/static/weixin/image/dc_logo.png"/>
+        </div>
+      <div class=" weui-cells_form">
         <form id="subForm" method="post">
-            <div class="weui-cell">
-                <div class="weui-cell__hd"><label class="weui-label">姓名</label></div>
-                <div class="weui-cell__bd">
-                    <input class="weui-input" name="name" value="${theOrder.name}" placeholder="姓名">
-                </div>
-            </div>
-            <div class="weui-cell" id="divTeam">
-                <div class="weui-cell__hd"><label class="weui-label">团队</label></div>
-                <c:if test="${theOrder.status == '0'}">
+            <div class="weui-cells" style="margin: 0;">
+                <div class="weui-cell">
+                    <div class="weui-cell__hd"><label class="weui-label">姓名</label></div>
                     <div class="weui-cell__bd">
-                        <label><input type="radio" name="team" onchange="teamCg()" value="盛小兰" <c:if test="${theOrder.team != '盛小兰'}">disabled</c:if> <c:if test="${theOrder.team == '盛小兰'}">checked</c:if> />盛小兰</label>&nbsp;&nbsp;
-                        <label><input type="radio" id="isAdmin"  onchange="teamCg()" name="team" value="潘中"   <c:if test="${theOrder.team != '潘中'}">disabled</c:if>  <c:if test="${theOrder.team == '潘中'}">checked</c:if> />潘中</label><br>
-                        <label><input type="radio" name="team" onchange="teamCg()" value="王春生" <c:if test="${theOrder.team != '王春生'}">disabled</c:if> <c:if test="${theOrder.team == '王春生'}">checked</c:if> />王春生</label>&nbsp;&nbsp;
-                        <label><input type="radio" name="team" onchange="teamCg()" value="其他" <c:if test="${theOrder.team != '其他'}">disabled</c:if>  <c:if test="${theOrder.team == '其他'}">checked</c:if> />其他</label>
-                        <%--<label><input type="button" onclick="updateStatus()" value="修改"></label>--%>
+                        <input class="weui-input" name="name" value="${theOrder.name}" placeholder="姓名">
                     </div>
-                    <div class="weui-cell__ft">
-                        <i onclick="updateStatus()" class="weui-icon-cancel"></i>
-                        <%--<input type="button" onclick="updateStatus()" class="weui-btn" value="修改"/>--%>
+                </div>
+                <c:if test="${theOrder.status == '0'}">
+                    <div class="weui-cell" id="divTeam">
+                        <div class="weui-cell__hd">
+                            <label class="weui-label">团队</label>
+                            <a href="javascript:;" onclick="updateStatus()" style="font-size: 12px;padding: 5px;color: green;">修改</a>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <label><input type="radio" id="isAdmin"  onchange="teamCg()" name="team" value="潘中"   <c:if test="${theOrder.team != '潘中'}">disabled</c:if>  <c:if test="${theOrder.team == '潘中'}">checked</c:if> />潘  中</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <label><input type="radio" name="team" onchange="teamCg()" value="盛小兰" <c:if test="${theOrder.team != '盛小兰'}">disabled</c:if> <c:if test="${theOrder.team == '盛小兰'}">checked</c:if> />盛小兰</label><br>
+                            <label><input type="radio" name="team" onchange="teamCg()" value="王春生" <c:if test="${theOrder.team != '王春生'}">disabled</c:if> <c:if test="${theOrder.team == '王春生'}">checked</c:if> />王春生</label>&nbsp;&nbsp;&nbsp;
+                            <label><input type="radio" name="team" onchange="teamCg()" value="其他" <c:if test="${theOrder.team != '其他'}">disabled</c:if>  <c:if test="${theOrder.team == '其他'}">checked</c:if> />其  他</label>
+                            <%--<label><input type="button" onclick="updateStatus()" value="修改"></label>--%>
+                        </div>
                     </div>
                 </c:if>
-
                 <c:if test="${theOrder.status == '1'}">
-                    <div class="weui-cell__bd">
-                        <label><input type="radio" name="team" onchange="teamCg()" value="盛小兰" />盛小兰</label>&nbsp;&nbsp;
-                        <label><input type="radio" id="isAdmin"  onchange="teamCg()" name="team" value="潘中"   <c:if test="${theOrder.team == '潘中'}">checked</c:if> />潘中</label><br>
-                        <label><input type="radio" name="team" onchange="teamCg()" value="王春生" />王春生</label>&nbsp;&nbsp;
-                        <label><input type="radio" name="team" onchange="teamCg()" value="其他"  checked />其他</label>
+                    <div class="weui-cell" id="divTeam">
+                        <div class="weui-cell__hd">
+                            <label class="weui-label">团队</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <label><input type="radio" id="isAdmin"  onchange="teamFirstCg()" name="team" value="潘中"/> &nbsp;潘   中 </label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <label><input type="radio" name="team" onchange="teamFirstCg()" value="盛小兰" />盛小兰</label><br>
+                            <label><input type="radio" name="team" onchange="teamFirstCg()" value="王春生" />王春生</label>&nbsp;&nbsp;
+                            <label><input type="radio" name="team" onchange="teamFirstCg()" value="其他"  checked />其 他</label>
+                        </div>
                     </div>
                 </c:if>
-            </div>
-                    <div class="weui-cell" id="divDepartment">
+                    <div class="weui-cell notclick" id="divDepartment">
                         <div class="weui-cell__hd"><label class="weui-label">部门</label></div>
                         <div class="weui-cell__bd">
                             <input class="weui-input" onChange="departmentChange()" type="text"  id='department' value="${theOrder.department}"/>
                         </div>
                     </div>
                     <input type="text" value="" name="department" id="departmentSure" hidden>
-                    <div class="weui-cell" id="spc1">
+                    <div class="weui-cell notclick" id="spc1">
                         <div class="weui-cell__hd"><label class="weui-label">工程部门</label></div>
                         <div class="weui-cell__bd">
                             <input class="weui-input" type="text" name="specific1" id='specific1' value="${theOrder.specific}"/>
                         </div>
                     </div>
-                    <div class="weui-cell" id="spc2">
+                    <div class="weui-cell notclick" id="spc2">
                         <div class="weui-cell__hd"><label class="weui-label">财务部门</label></div>
                         <div class="weui-cell__bd">
                             <input class="weui-input" type="text" name="specific2" id='specific2' value="${theOrder.specific}"/>
@@ -89,30 +100,29 @@
                     <input type="text" value="" name="specific" id="specific" hidden>
             <input type="text" value="${theOrder.status}" hidden name="status"/>
             <input type="text" value="${theOrder.correlationId}" hidden name="correlationId"/>
+            </div>
             <%--<input class="weui-input" type="text" name="team" id='team' value="${theOrder.team}" onChange="teamChange()"/>--%>
         </form>
-        <div class="weui-cell">
-        </div>
-    <%--</div>--%>
-    <div class="" style="text-align: center;">
-        <div class="weui-cells__title"><h4>预定<span id="currentDate"></span>订工作餐</h4></div>
-                <c:if test="${theOrder.exits == '1'}">
-                    <div class="button-2 blue" id="buttonPlan" onclick="plan()">
-                        <div style="line-height: 150px;height:150px;padding-top: 55px">
-                            <span class="btn_span_list" id="plan">预订餐</span><br><span class="btn_span_list" id="spantime"></span>
+    </div>
+        <div class="" style="text-align: center;border-radius: 50%;">
+            <div class="weui-cells__title"><h4 style="font-weight: 100;">预定<span id="currentDate" style="color:#666;"></span>工作餐</h4></div>
+                    <c:if test="${theOrder.exits == '1'}">
+                        <div class="button-2 blue" id="buttonPlan" onclick="plan()">
+                            <div class="btn_div_list" style="line-height: 90px;height:90px;padding-top: 55px;">
+                                <span class="btn_span_list" id="plan">预订</span><br><span class="btn_span_list" id="spantime"></span>
+                            </div>
                         </div>
-                    </div>
-                        </c:if>
-                <c:if test="${theOrder.exits == '0'}">
-                    <div class="button-2 blue" id="buttonPlan" style="background:#999999;" disabled>
-                        <div style="line-height: 150px;height:150px;padding-top: 55px">
-                            <span class="btn_span_list">已订餐</span>
+                            </c:if>
+                    <c:if test="${theOrder.exits == '0'}">
+                        <div class="button-2 blue notclick" id="buttonPlan" style="background:#dcdbdb;">
+                            <div style="line-height: 130px;height:130px;padding-top: 65px">
+                                <span class="btn_span_list" style="color: #0b61a4">已订餐</span>
+                            </div>
                         </div>
-                    </div>
-                </c:if>
-            </div>
-        <div class="weui-cells__tips"style="width: 100%;text-align: center">请在0：00-16：00前预订第二天的用餐</div>
-    </div>
+                    </c:if>
+                </div>
+            <div class="" style="width: 100%;text-align: center;font-size: 14px;color: #666666;">请在0:00-16:00前预订第二天的用餐</div>
+        </div>
     <div class="bottem_div">兴光信息技术支持</div>
 </body>
 <script type="text/javascript">
@@ -155,13 +165,14 @@
         sureDepart();
         $.post("/weXin/theOrder/noSureTem",$('#subForm').serialize(),function(data){
             if(data.success){
-                $("#plan").text("已预定");
+                $("#plan").text("已订餐");
+                $("#plan").attr("style","color: #0b61a4");
                 $("#spantime").attr("style","display: none");
                 $.toast(data.msg);
             }else{
                 $.toast(data.msg, "cancel");
-                $("#button2").attr("disabled",false);
-                $("#button2").attr("background","#0095cd");
+                $("#buttonPlan").removeClass("notclick");
+                $("#buttonPlan").attr("background","#0095cd");
             }
         })
     }
@@ -172,7 +183,7 @@
     });
     $("#department").select({
         title: "选择部门",
-        items: ["工程", "财务","管理咨询","资产评估","其他"]
+        items: ["财务", "工程","管理咨询","资产评估","其他"]
     });
     $("#specific2").select({
         title: "选择级联部门（财务）",
@@ -195,6 +206,20 @@
         }
     }
     teamCg();
+    function teamFirstCg() {
+        if ($("#isAdmin").is(":checked")) {
+            $("#department").val("其他");
+            $("#divDepartment").attr("style","display:''");
+            $("#divDepartment").removeClass("notclick");
+            $("#spc1").removeClass("notclick");
+            $("#spc2").removeClass("notclick");
+            departmentChange();
+        }else {
+            $("#divDepartment").attr("style","display: none");
+            $("#spc1").attr("style","display: none");
+            $("#spc2").attr("style","display: none");
+        }
+    }
     //联动效果
     function teamChange() {
        var team =  $("#team").val();
@@ -211,23 +236,26 @@
         if (department == '财务'){
             $("#spc1").attr("style","display: none");
             $("#spc2").attr("style","display: ''");
-            $("#specific2").val("其他")
+            $("#specific2").val("审计部")
         }else if (department == '工程') {
             $("#spc2").attr("style","display: none");
             $("#spc1").attr("style","display: ''");
-            $("#specific1").val("其他")
+            $("#specific1").val("工程一部")
         }else {
             $("#spc1").attr("style","display: none");
             $("#spc2").attr("style","display: none");
         }
     }
     function changeStatus() {
-        $("#buttonPlan").attr("disabled","true");
-        $("#buttonPlan").attr("style","background:#999999");
+        $("#buttonPlan").addClass("notclick");
+        $("#buttonPlan").attr("style","background:#dcdbdb");
     }
 
     function updateStatus() {
         $("input[name='team']").attr("disabled",false);
+        $("#divDepartment").removeClass("notclick");
+        $("#spc1").removeClass("notclick");
+        $("#spc2").removeClass("notclick");
     }
     function sureDepart() {
         if ($("#isAdmin").is(":checked")){