张天舒 / station · 提交

转到一个项目

作者 zhangFan
提交 c93b0f7701f95b42a9b5fa68ff6ac6e585ecdaa9 1 个父辈 bfa53da3

删减非必要字段

内嵌 并排对比
正在显示 21 个修改的文件 包含 436 行增加 和 466 行删除
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <druid.version>1.0.18</druid.version> 23 <druid.version>1.0.18</druid.version>
24 <ehcache.version>2.6.11</ehcache.version> 24 <ehcache.version>2.6.11</ehcache.version>
25 <ehcache-web.version>2.0.4</ehcache-web.version> 25 <ehcache-web.version>2.0.4</ehcache-web.version>
26 - <shiro.version>1.2.3</shiro.version> 26 + <shiro.version>1.2.5</shiro.version>
27 <sitemesh.version>2.4.2</sitemesh.version> 27 <sitemesh.version>2.4.2</sitemesh.version>
28 <activiti.version>5.21.0</activiti.version> 28 <activiti.version>5.21.0</activiti.version>
29 29
@@ -914,7 +914,7 @@ @@ -914,7 +914,7 @@
914 <plugin> 914 <plugin>
915 <groupId>org.apache.maven.plugins</groupId> 915 <groupId>org.apache.maven.plugins</groupId>
916 <artifactId>maven-antrun-plugin</artifactId> 916 <artifactId>maven-antrun-plugin</artifactId>
917 - <version>1.7</version> 917 + <version>1.8</version>
918 <configuration> 918 <configuration>
919 <target> 919 <target>
920 920
@@ -973,14 +973,14 @@ @@ -973,14 +973,14 @@
973 </profiles> 973 </profiles>
974 974
975 <!-- 开发者信息 --> 975 <!-- 开发者信息 -->
976 - <developers>  
977 - <developer>  
978 - <id>Promise</id>  
979 - <name>Promise</name>  
980 - <email>cpufun@163.com</email>  
981 - <roles><role>Project lead</role></roles>  
982 - <timezone>+8</timezone>  
983 - </developer>  
984 - </developers> 976 + <!--<developers>-->
  977 + <!--<developer>-->
  978 + <!--<id>Promise</id>-->
  979 + <!--<name>Promise</name>-->
  980 + <!--<email>cpufun@163.com</email>-->
  981 + <!--<roles><role>Project lead</role></roles>-->
  982 + <!--<timezone>+8</timezone>-->
  983 + <!--</developer>-->
  984 + <!--</developers>-->
985 985
986 </project> 986 </project>
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.dao; 4 package com.thinkgem.jeesite.modules.land.dao;
5 5
  6 +import java.util.Date;
6 import java.util.List; 7 import java.util.List;
7 8
8 import org.apache.ibatis.annotations.Param; 9 import org.apache.ibatis.annotations.Param;
@@ -32,8 +33,11 @@ public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> { @@ -32,8 +33,11 @@ public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> {
32 33
33 int updateEntry(LandBusinesstypeList landBusinesstypeList); 34 int updateEntry(LandBusinesstypeList landBusinesstypeList);
34 35
  36 + int deleteByPrimaryKey(String id);
  37 +
35 int deleteByMessageId(LandBusinesstypeList landBusinesstypeList); 38 int deleteByMessageId(LandBusinesstypeList landBusinesstypeList);
36 39
37 List<LandBusinesstypeList> findByIsValid(@Param("trailerFrameNo")String frameNo, @Param("isvalid")String isValid); 40 List<LandBusinesstypeList> findByIsValid(@Param("trailerFrameNo")String frameNo, @Param("isvalid")String isValid);
38 41
  42 + List<LandBusinesstypeList> findByTime(@Param("time1")Date time,@Param("time2")Date time2);
39 } 43 }
1 -/**  
2 - * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.  
3 - */  
4 -package com.thinkgem.jeesite.modules.land.dao;  
5 -  
6 -import com.thinkgem.jeesite.common.persistence.CrudDao;  
7 -import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;  
8 -import com.thinkgem.jeesite.modules.land.entity.LandResponseMessage;  
9 -  
10 -/**  
11 - * 回执内容DAO接口  
12 - * @author zhangfan  
13 - * @version 2018-10-08  
14 - */  
15 -@MyBatisDao  
16 -public interface LandResponseMessageDao extends CrudDao<LandResponseMessage> {  
17 -  
18 -}  
1 -/**  
2 - * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.  
3 - */  
4 -package com.thinkgem.jeesite.modules.land.entity;  
5 -  
6 -import org.hibernate.validator.constraints.Length;  
7 -import java.util.Date;  
8 -import com.fasterxml.jackson.annotation.JsonFormat;  
9 -  
10 -import com.thinkgem.jeesite.common.persistence.DataEntity;  
11 -  
12 -/**  
13 - * 回执内容Entity  
14 - * @author zhangfan  
15 - * @version 2018-10-08  
16 - */  
17 -public class LandResponseMessage extends DataEntity<LandResponseMessage> {  
18 -  
19 - private static final long serialVersionUID = 1L;  
20 - private String messageId; // 回执ID  
21 - private String responseCode; // 回执代码  
22 - private String responseText; // 回执描述  
23 - private Date responseTime; // response_time  
24 -  
25 - public LandResponseMessage() {  
26 - super();  
27 - }  
28 -  
29 - public LandResponseMessage(String id){  
30 - super(id);  
31 - }  
32 -  
33 - @Length(min=0, max=64, message="回执ID长度必须介于 0 和 64 之间")  
34 - public String getMessageId() {  
35 - return messageId;  
36 - }  
37 -  
38 - public void setMessageId(String messageId) {  
39 - this.messageId = messageId;  
40 - }  
41 -  
42 - @Length(min=0, max=5, message="回执代码长度必须介于 0 和 5 之间")  
43 - public String getResponseCode() {  
44 - return responseCode;  
45 - }  
46 -  
47 - public void setResponseCode(String responseCode) {  
48 - this.responseCode = responseCode;  
49 - }  
50 -  
51 - @Length(min=0, max=512, message="回执描述长度必须介于 0 和 512 之间")  
52 - public String getResponseText() {  
53 - return responseText;  
54 - }  
55 -  
56 - public void setResponseText(String responseText) {  
57 - this.responseText = responseText;  
58 - }  
59 -  
60 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")  
61 - public Date getResponseTime() {  
62 - return responseTime;  
63 - }  
64 -  
65 - public void setResponseTime(Date responseTime) {  
66 - this.responseTime = responseTime;  
67 - }  
68 -  
69 -}  
@@ -63,7 +63,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -63,7 +63,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
63 @JsonFormat(timezone="GMT+8") 63 @JsonFormat(timezone="GMT+8")
64 private Date proposeTime; // 申请时间 64 private Date proposeTime; // 申请时间
65 private String veClassFlag; // 车辆分类 65 private String veClassFlag; // 车辆分类
66 - private String operationType; // 删除标识 66 + private String operationType; // 暂用 审批标识
67 private String trailerLicenseNo; // 挂车牌号 67 private String trailerLicenseNo; // 挂车牌号
68 private String trailerFrameNo; // 挂车车架号 68 private String trailerFrameNo; // 挂车车架号
69 private String approNoPic; // 批文扫描图 69 private String approNoPic; // 批文扫描图
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.service; 4 package com.thinkgem.jeesite.modules.land.service;
5 5
  6 +import java.util.Date;
6 import java.util.List; 7 import java.util.List;
7 8
8 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,4 +88,12 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis @@ -87,4 +88,12 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis
87 public List<LandBusinesstypeList> findByIsValid(String frameNo,String isValid){ 88 public List<LandBusinesstypeList> findByIsValid(String frameNo,String isValid){
88 return dao.findByIsValid(frameNo,isValid); 89 return dao.findByIsValid(frameNo,isValid);
89 } 90 }
  91 + @Transactional(readOnly = false)
  92 + public List<LandBusinesstypeList> findBytime(Date time1,Date time2){
  93 + return dao.findByTime(time1,time2);
  94 + }
  95 + @Transactional(readOnly=false)
  96 + public int deleteByPrimaryKey(String id) {
  97 + return dao.deleteByPrimaryKey(id);
  98 + }
90 } 99 }
1 -/**  
2 - * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.  
3 - */  
4 -package com.thinkgem.jeesite.modules.land.service;  
5 -  
6 -import java.util.List;  
7 -  
8 -import org.springframework.stereotype.Service;  
9 -import org.springframework.transaction.annotation.Transactional;  
10 -  
11 -import com.thinkgem.jeesite.common.persistence.Page;  
12 -import com.thinkgem.jeesite.common.service.CrudService;  
13 -import com.thinkgem.jeesite.modules.land.entity.LandResponseMessage;  
14 -import com.thinkgem.jeesite.modules.land.dao.LandResponseMessageDao;  
15 -  
16 -/**  
17 - * 回执内容Service  
18 - * @author zhangfan  
19 - * @version 2018-10-08  
20 - */  
21 -@Service  
22 -@Transactional(readOnly = true)  
23 -public class LandResponseMessageService extends CrudService<LandResponseMessageDao, LandResponseMessage> {  
24 -  
25 - public LandResponseMessage get(String id) {  
26 - return super.get(id);  
27 - }  
28 -  
29 - public List<LandResponseMessage> findList(LandResponseMessage landResponseMessage) {  
30 - return super.findList(landResponseMessage);  
31 - }  
32 -  
33 - public Page<LandResponseMessage> findPage(Page<LandResponseMessage> page, LandResponseMessage landResponseMessage) {  
34 - return super.findPage(page, landResponseMessage);  
35 - }  
36 -  
37 - @Transactional(readOnly = false)  
38 - public void save(LandResponseMessage landResponseMessage) {  
39 - super.save(landResponseMessage);  
40 - }  
41 -  
42 - @Transactional(readOnly = false)  
43 - public void delete(LandResponseMessage landResponseMessage) {  
44 - super.delete(landResponseMessage);  
45 - }  
46 -  
47 -}  
@@ -3,31 +3,11 @@ @@ -3,31 +3,11 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.web; 4 package com.thinkgem.jeesite.modules.land.web;
5 5
6 -import java.text.SimpleDateFormat;  
7 -import java.util.ArrayList;  
8 -import java.util.Date;  
9 -import java.util.List;  
10 -import java.util.Random;  
11 -  
12 -import javax.annotation.PostConstruct;  
13 -import javax.servlet.http.HttpServletRequest;  
14 -import javax.servlet.http.HttpServletResponse;  
15 -  
16 -import org.apache.shiro.authz.annotation.RequiresPermissions;  
17 -import org.springframework.beans.factory.annotation.Autowired;  
18 -import org.springframework.stereotype.Controller;  
19 -import org.springframework.ui.Model;  
20 -import org.springframework.web.bind.annotation.ModelAttribute;  
21 -import org.springframework.web.bind.annotation.RequestMapping;  
22 -import org.springframework.web.bind.annotation.RequestParam;  
23 -import org.springframework.web.bind.annotation.ResponseBody;  
24 -import org.springframework.web.servlet.mvc.support.RedirectAttributes;  
25 -  
26 import com.thinkgem.jeesite.common.barCode.buildBarCode; 6 import com.thinkgem.jeesite.common.barCode.buildBarCode;
27 import com.thinkgem.jeesite.common.config.Global; 7 import com.thinkgem.jeesite.common.config.Global;
28 import com.thinkgem.jeesite.common.persistence.Page; 8 import com.thinkgem.jeesite.common.persistence.Page;
29 -import com.thinkgem.jeesite.common.web.BaseController;  
30 import com.thinkgem.jeesite.common.utils.StringUtils; 9 import com.thinkgem.jeesite.common.utils.StringUtils;
  10 +import com.thinkgem.jeesite.common.web.BaseController;
31 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList; 11 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
32 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord; 12 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
33 import com.thinkgem.jeesite.modules.land.entity.VehicleMainifist; 13 import com.thinkgem.jeesite.modules.land.entity.VehicleMainifist;
@@ -45,6 +25,21 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet; @@ -45,6 +25,21 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
45 import com.thinkgem.jeesite.modules.yard.entity.Yard; 25 import com.thinkgem.jeesite.modules.yard.entity.Yard;
46 import com.thinkgem.jeesite.modules.yard.service.BayonetService; 26 import com.thinkgem.jeesite.modules.yard.service.BayonetService;
47 import com.thinkgem.jeesite.modules.yard.service.YardService; 27 import com.thinkgem.jeesite.modules.yard.service.YardService;
  28 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  29 +import org.springframework.beans.factory.annotation.Autowired;
  30 +import org.springframework.stereotype.Controller;
  31 +import org.springframework.ui.Model;
  32 +import org.springframework.web.bind.annotation.ModelAttribute;
  33 +import org.springframework.web.bind.annotation.RequestMapping;
  34 +import org.springframework.web.bind.annotation.RequestParam;
  35 +import org.springframework.web.bind.annotation.ResponseBody;
  36 +import org.springframework.web.servlet.mvc.support.RedirectAttributes;
  37 +
  38 +import javax.servlet.http.HttpServletRequest;
  39 +import javax.servlet.http.HttpServletResponse;
  40 +import java.text.ParseException;
  41 +import java.text.SimpleDateFormat;
  42 +import java.util.*;
48 43
49 /** 44 /**
50 * 货物流转类型Controller 45 * 货物流转类型Controller
@@ -101,6 +96,9 @@ public class LandBusinesstypeListController extends BaseController { @@ -101,6 +96,9 @@ public class LandBusinesstypeListController extends BaseController {
101 Principal principal = UserUtils.getPrincipal(); 96 Principal principal = UserUtils.getPrincipal();
102 String loginName = principal.getLoginName(); 97 String loginName = principal.getLoginName();
103 User user = systemService.getUserByLoginName(loginName); 98 User user = systemService.getUserByLoginName(loginName);
  99 + if (user == null) {
  100 + return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
  101 + }
104 Yard yard = new Yard(); 102 Yard yard = new Yard();
105 List<Yard> yardList = yardService.findList(yard); 103 List<Yard> yardList = yardService.findList(yard);
106 List<LandBusinesstypeList> lists = new ArrayList<LandBusinesstypeList>(); 104 List<LandBusinesstypeList> lists = new ArrayList<LandBusinesstypeList>();
@@ -110,18 +108,19 @@ public class LandBusinesstypeListController extends BaseController { @@ -110,18 +108,19 @@ public class LandBusinesstypeListController extends BaseController {
110 List<User> u = systemService.findByOfficeId(office.getId()); 108 List<User> u = systemService.findByOfficeId(office.getId());
111 for (int i = 0; i < u.size(); i++) { 109 for (int i = 0; i < u.size(); i++) {
112 landBusinesstypeList.setCreateBy(u.get(i)); 110 landBusinesstypeList.setCreateBy(u.get(i));
113 - page = landBusinesstypeListService  
114 - .findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList); 111 + page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response),
  112 + landBusinesstypeList);
115 lists.addAll(page.getList()); 113 lists.addAll(page.getList());
116 } 114 }
117 } else { 115 } else {
118 Role role = systemService.getByUserId(user.getId()); 116 Role role = systemService.getByUserId(user.getId());
119 - if("admin".equals(role.getEnname())||"leader".equals(role.getEnname())) { 117 + if ("admin".equals(role.getEnname()) || "leader".equals(role.getEnname())) {
120 landBusinesstypeList.setCreateBy(systemService.getUserByLoginName("admin")); 118 landBusinesstypeList.setCreateBy(systemService.getUserByLoginName("admin"));
121 - }else { 119 + } else {
122 landBusinesstypeList.setCreateBy(user); 120 landBusinesstypeList.setCreateBy(user);
123 } 121 }
124 - page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList); 122 + page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response),
  123 + landBusinesstypeList);
125 lists.addAll(page.getList()); 124 lists.addAll(page.getList());
126 } 125 }
127 page.setList(lists); 126 page.setList(lists);
@@ -205,6 +204,9 @@ public class LandBusinesstypeListController extends BaseController { @@ -205,6 +204,9 @@ public class LandBusinesstypeListController extends BaseController {
205 List<Yard> yardList = yardService.findList(yard); 204 List<Yard> yardList = yardService.findList(yard);
206 LandRoadVeRecord ve = new LandRoadVeRecord(); 205 LandRoadVeRecord ve = new LandRoadVeRecord();
207 User user = systemService.getUserByLoginName("admin"); 206 User user = systemService.getUserByLoginName("admin");
  207 + if (user == null) {
  208 + return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
  209 + }
208 ve.setCreateBy(user); 210 ve.setCreateBy(user);
209 211
210 List<LandRoadVeRecord> veList = roadVeService.findList(ve); 212 List<LandRoadVeRecord> veList = roadVeService.findList(ve);
@@ -225,9 +227,16 @@ public class LandBusinesstypeListController extends BaseController { @@ -225,9 +227,16 @@ public class LandBusinesstypeListController extends BaseController {
225 if (!beanValidator(model, landBusinesstypeList)) { 227 if (!beanValidator(model, landBusinesstypeList)) {
226 return form(landBusinesstypeList, model); 228 return form(landBusinesstypeList, model);
227 } 229 }
228 - if(!(landBusinesstypeList.getIsvalid()!=null)) {  
229 - List<LandBusinesstypeList> lists = landBusinesstypeListService.findByIsValid(landBusinesstypeList.getTrailerFrameNo(), "0");  
230 - if(lists.size()>0) { 230 + Principal principal = UserUtils.getPrincipal();
  231 + String loginName = principal.getLoginName();
  232 + User user = systemService.getUserByLoginName(loginName);
  233 + if (user == null) {
  234 + return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
  235 + }
  236 + if (!(landBusinesstypeList.getIsvalid() != null)) {
  237 + List<LandBusinesstypeList> lists = landBusinesstypeListService
  238 + .findByIsValid(landBusinesstypeList.getTrailerFrameNo(), "0");
  239 + if (lists.size() > 0) {
231 addMessage(redirectAttributes, "当前车辆已做出入申请，请重新录入"); 240 addMessage(redirectAttributes, "当前车辆已做出入申请，请重新录入");
232 return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage"; 241 return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
233 } 242 }
@@ -285,7 +294,9 @@ public class LandBusinesstypeListController extends BaseController { @@ -285,7 +294,9 @@ public class LandBusinesstypeListController extends BaseController {
285 public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes) 294 public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes)
286 throws Exception { 295 throws Exception {
287 boolean flag = false; 296 boolean flag = false;
288 - List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode()); 297 + if (landBusinesstypeList.getBarcode() != null && landBusinesstypeList.getBarcode().length()>0) {
  298 + List<LandBusinesstypeList> list = landBusinesstypeListService
  299 + .findByBarcode(landBusinesstypeList.getBarcode());
289 for (int i = 0; i < list.size(); i++) { 300 for (int i = 0; i < list.size(); i++) {
290 String flag1 = list.get(i).getContrastflag(); 301 String flag1 = list.get(i).getContrastflag();
291 if (flag1 != null) { 302 if (flag1 != null) {
@@ -301,38 +312,54 @@ public class LandBusinesstypeListController extends BaseController { @@ -301,38 +312,54 @@ public class LandBusinesstypeListController extends BaseController {
301 } else { 312 } else {
302 addMessage(redirectAttributes, "删除失败,已有业务已进出站"); 313 addMessage(redirectAttributes, "删除失败,已有业务已进出站");
303 } 314 }
  315 + } else {
  316 + landBusinesstypeListService.deleteByPrimaryKey(landBusinesstypeList.getId());
  317 + addMessage(redirectAttributes, "删除申请单成功");
  318 + }
304 319
305 return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage"; 320 return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
306 } 321 }
307 322
308 @RequiresPermissions("land:landBusinesstypeList:edit") 323 @RequiresPermissions("land:landBusinesstypeList:edit")
309 - @RequestMapping(value = "update") 324 + @RequestMapping(value = "updateError")
310 public String update(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes) 325 public String update(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes)
311 throws Exception { 326 throws Exception {
  327 + if ("E".equals(landBusinesstypeList.getTurnoverflag())) {
  328 + landBusinesstypeList.setContrastflag("非正常出站");
  329 + }
  330 + if ("I".equals(landBusinesstypeList.getTurnoverflag())) {
  331 + landBusinesstypeList.setContrastflag("非正常进站");
  332 + }
  333 + landBusinesstypeListService.updateEntry(landBusinesstypeList);
  334 +
312 List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode()); 335 List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
313 for (int i = 0; i < list.size(); i++) { 336 for (int i = 0; i < list.size(); i++) {
314 list.get(i).setIsvalid("1"); 337 list.get(i).setIsvalid("1");
315 - if("E".equals(list.get(i).getTurnoverflag())) {  
316 - list.get(i).setContrastflag("非正常出站");  
317 - }  
318 landBusinesstypeListService.updateEntry(list.get(i)); 338 landBusinesstypeListService.updateEntry(list.get(i));
319 } 339 }
320 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo()); 340 buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  341 + addMessage(redirectAttributes, "异常处理成功");
321 return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage"; 342 return "redirect:" + Global.getAdminPath() + "/land/landBusinesstypeList/?repage";
322 } 343 }
323 344
324 -  
325 public boolean insertType1(LandBusinesstypeList landBusinesstypeList) { 345 public boolean insertType1(LandBusinesstypeList landBusinesstypeList) {
326 - boolean flag = false; 346 +
327 try { 347 try {
  348 + String messageId = dateTimeFormat();
  349 +
  350 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  351 + if (barCode.length() < 1 | barCode == null) {
  352 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  353 + return false;
  354 + }
328 // first entry in 355 // first entry in
329 - String messageId = LandBusinesstypeListController.dateTimeFormat();  
330 String mainfistList = landBusinesstypeList.getMasterList(); 356 String mainfistList = landBusinesstypeList.getMasterList();
331 String startport = landBusinesstypeList.getStartport(); 357 String startport = landBusinesstypeList.getStartport();
332 String endport = landBusinesstypeList.getEndport(); 358 String endport = landBusinesstypeList.getEndport();
333 String startStation = landBusinesstypeList.getStartsatation(); 359 String startStation = landBusinesstypeList.getStartsatation();
334 String endStation = landBusinesstypeList.getEndstation(); 360 String endStation = landBusinesstypeList.getEndstation();
335 String isfull = landBusinesstypeList.getIsfull(); 361 String isfull = landBusinesstypeList.getIsfull();
  362 +
336 landBusinesstypeList.setMassageId(messageId); 363 landBusinesstypeList.setMassageId(messageId);
337 landBusinesstypeList.setStartport(""); 364 landBusinesstypeList.setStartport("");
338 landBusinesstypeList.setStartsatation(""); 365 landBusinesstypeList.setStartsatation("");
@@ -340,6 +367,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -340,6 +367,7 @@ public class LandBusinesstypeListController extends BaseController {
340 landBusinesstypeList.setEndstation(startStation); 367 landBusinesstypeList.setEndstation(startStation);
341 landBusinesstypeList.setMasterList(""); 368 landBusinesstypeList.setMasterList("");
342 landBusinesstypeList.setProdectTime(new Date()); 369 landBusinesstypeList.setProdectTime(new Date());
  370 + landBusinesstypeList.setBarcode(barCode);
343 landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel()); 371 landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
344 landBusinesstypeListService.save(landBusinesstypeList); 372 landBusinesstypeListService.save(landBusinesstypeList);
345 insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList); 373 insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
@@ -348,6 +376,7 @@ public class LandBusinesstypeListController extends BaseController { @@ -348,6 +376,7 @@ public class LandBusinesstypeListController extends BaseController {
348 LandBusinesstypeList list = new LandBusinesstypeList(); 376 LandBusinesstypeList list = new LandBusinesstypeList();
349 list.setAgentname(landBusinesstypeList.getAgentname()); 377 list.setAgentname(landBusinesstypeList.getAgentname());
350 list.setAgentno(landBusinesstypeList.getAgentno()); 378 list.setAgentno(landBusinesstypeList.getAgentno());
  379 + list.setCocode(landBusinesstypeList.getCocode());
351 list.setIsDelete("0"); 380 list.setIsDelete("0");
352 list.setIsvalid("0"); 381 list.setIsvalid("0");
353 list.setIsfull(isfull); 382 list.setIsfull(isfull);
@@ -364,12 +393,14 @@ public class LandBusinesstypeListController extends BaseController { @@ -364,12 +393,14 @@ public class LandBusinesstypeListController extends BaseController {
364 list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel()); 393 list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
365 list.setTurnoverflag("E"); 394 list.setTurnoverflag("E");
366 list.setMassageId(messageId); 395 list.setMassageId(messageId);
  396 + list.setBarcode(barCode);
367 landBusinesstypeListService.save(list); 397 landBusinesstypeListService.save(list);
368 398
369 // third 399 // third
370 LandBusinesstypeList list1 = new LandBusinesstypeList(); 400 LandBusinesstypeList list1 = new LandBusinesstypeList();
371 list1.setAgentname(landBusinesstypeList.getAgentname()); 401 list1.setAgentname(landBusinesstypeList.getAgentname());
372 list1.setAgentno(landBusinesstypeList.getAgentno()); 402 list1.setAgentno(landBusinesstypeList.getAgentno());
  403 + list1.setCocode(landBusinesstypeList.getCocode());
373 list1.setIsDelete("0"); 404 list1.setIsDelete("0");
374 list1.setIsvalid("0"); 405 list1.setIsvalid("0");
375 list1.setIsfull(isfull); 406 list1.setIsfull(isfull);
@@ -388,12 +419,14 @@ public class LandBusinesstypeListController extends BaseController { @@ -388,12 +419,14 @@ public class LandBusinesstypeListController extends BaseController {
388 list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel()); 419 list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
389 list1.setTurnoverflag("I"); 420 list1.setTurnoverflag("I");
390 list1.setMassageId(messageId); 421 list1.setMassageId(messageId);
  422 + list1.setBarcode(barCode);
391 landBusinesstypeListService.save(list1); 423 landBusinesstypeListService.save(list1);
392 424
393 // four 425 // four
394 LandBusinesstypeList list2 = new LandBusinesstypeList(); 426 LandBusinesstypeList list2 = new LandBusinesstypeList();
395 list2.setAgentname(landBusinesstypeList.getAgentname()); 427 list2.setAgentname(landBusinesstypeList.getAgentname());
396 list2.setAgentno(landBusinesstypeList.getAgentno()); 428 list2.setAgentno(landBusinesstypeList.getAgentno());
  429 + list2.setCocode(landBusinesstypeList.getCocode());
397 list2.setIsDelete("0"); 430 list2.setIsDelete("0");
398 list2.setIsvalid("0"); 431 list2.setIsvalid("0");
399 list2.setIsfull(isfull); 432 list2.setIsfull(isfull);
@@ -414,55 +447,41 @@ public class LandBusinesstypeListController extends BaseController { @@ -414,55 +447,41 @@ public class LandBusinesstypeListController extends BaseController {
414 list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel()); 447 list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
415 list2.setTurnoverflag("E"); 448 list2.setTurnoverflag("E");
416 list2.setMassageId(messageId); 449 list2.setMassageId(messageId);
  450 + list2.setBarcode(barCode);
417 landBusinesstypeListService.save(list2); 451 landBusinesstypeListService.save(list2);
418 452
419 - String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);  
420 - List<LandBusinesstypeList> typeList = landBusinesstypeListService.findByMessageId(messageId);  
421 - int count = 0;  
422 - for (int i = 0; i < typeList.size(); i++) {  
423 - typeList.get(i).setBarcode(barCode);  
424 - landBusinesstypeListService.updateEntry(typeList.get(i));  
425 - count++;  
426 - if (count == typeList.size()) {  
427 - flag = true;  
428 - }  
429 - }  
430 - int countType = 0;  
431 - if (barCode == null) {  
432 - List<LandBusinesstypeList> typeList1 = landBusinesstypeListService.findByMessageId(messageId);  
433 - for (int i = 0; i < typeList1.size(); i++) {  
434 - landBusinesstypeListService.deleteByMessageId(typeList1.get(i));  
435 - countType++;  
436 - if (countType == typeList1.size()) {  
437 - flag = false;  
438 - }  
439 - }  
440 - }  
441 } catch (Exception e) { 453 } catch (Exception e) {
442 e.printStackTrace(); 454 e.printStackTrace();
443 } 455 }
444 - return flag; 456 + return true;
445 457
446 } 458 }
447 459
448 public boolean insertType2(LandBusinesstypeList landBusinesstypeList) { 460 public boolean insertType2(LandBusinesstypeList landBusinesstypeList) {
449 461
450 - boolean flag = false;  
451 try { 462 try {
  463 + String messageId = LandBusinesstypeListController.dateTimeFormat();
  464 +
  465 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  466 + if (barCode.length() < 1 | barCode == null) {
  467 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  468 + return false;
  469 + }
452 470
453 // first entry 471 // first entry
454 - String messageId = dateTimeFormat();  
455 String mainfistList = landBusinesstypeList.getMasterList(); 472 String mainfistList = landBusinesstypeList.getMasterList();
456 String isfull = landBusinesstypeList.getIsfull(); 473 String isfull = landBusinesstypeList.getIsfull();
457 landBusinesstypeList.setMassageId(messageId); 474 landBusinesstypeList.setMassageId(messageId);
458 landBusinesstypeList.setMasterList(""); 475 landBusinesstypeList.setMasterList("");
459 landBusinesstypeList.setProdectTime(new Date()); 476 landBusinesstypeList.setProdectTime(new Date());
  477 + landBusinesstypeList.setBarcode(barCode);
460 landBusinesstypeListService.save(landBusinesstypeList); 478 landBusinesstypeListService.save(landBusinesstypeList);
461 insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList); 479 insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
462 // second 480 // second
463 LandBusinesstypeList list = new LandBusinesstypeList(); 481 LandBusinesstypeList list = new LandBusinesstypeList();
464 list.setAgentname(landBusinesstypeList.getAgentname()); 482 list.setAgentname(landBusinesstypeList.getAgentname());
465 list.setAgentno(landBusinesstypeList.getAgentno()); 483 list.setAgentno(landBusinesstypeList.getAgentno());
  484 + list.setCocode(landBusinesstypeList.getCocode());
466 list.setIsDelete("0"); 485 list.setIsDelete("0");
467 list.setIsvalid("0"); 486 list.setIsvalid("0");
468 list.setIsfull(isfull); 487 list.setIsfull(isfull);
@@ -481,51 +500,38 @@ public class LandBusinesstypeListController extends BaseController { @@ -481,51 +500,38 @@ public class LandBusinesstypeListController extends BaseController {
481 list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel()); 500 list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
482 list.setTurnoverflag("E"); 501 list.setTurnoverflag("E");
483 list.setMassageId(messageId); 502 list.setMassageId(messageId);
  503 + list.setBarcode(barCode);
484 landBusinesstypeListService.save(list); 504 landBusinesstypeListService.save(list);
485 - String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);  
486 - List<LandBusinesstypeList> typeList = landBusinesstypeListService.findByMessageId(messageId);  
487 - int count = 0;  
488 - for (int i = 0; i < typeList.size(); i++) {  
489 - typeList.get(i).setBarcode(barCode);  
490 - landBusinesstypeListService.updateEntry(typeList.get(i));  
491 - count++;  
492 - if (count == typeList.size()) {  
493 - flag = true;  
494 - }  
495 - }  
496 - int countType = 0;  
497 - if (barCode == null) {  
498 - List<LandBusinesstypeList> typeList1 = landBusinesstypeListService.findByMessageId(messageId);  
499 - for (int i = 0; i < typeList1.size(); i++) {  
500 - landBusinesstypeListService.deleteByMessageId(typeList1.get(i));  
501 - countType++;  
502 - if (countType == typeList.size()) {  
503 - flag = false;  
504 - }  
505 - }  
506 - }  
507 } catch (Exception e) { 505 } catch (Exception e) {
508 e.printStackTrace(); 506 e.printStackTrace();
509 } 507 }
510 - return flag; 508 + return true;
511 } 509 }
512 510
513 public boolean insertType3(LandBusinesstypeList landBusinesstypeList) { 511 public boolean insertType3(LandBusinesstypeList landBusinesstypeList) {
514 512
515 - boolean flag = false;  
516 try { 513 try {
  514 +
  515 + String messageId = LandBusinesstypeListController.dateTimeFormat();
  516 +
  517 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);
  518 + if (barCode.length() < 1 | barCode == null) {
  519 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  520 + return false;
  521 + }
517 // first entry 522 // first entry
518 - String messageId = dateTimeFormat();  
519 landBusinesstypeList.setMassageId(messageId); 523 landBusinesstypeList.setMassageId(messageId);
520 String mainfistList = landBusinesstypeList.getMasterList(); 524 String mainfistList = landBusinesstypeList.getMasterList();
521 String isfull = landBusinesstypeList.getIsfull(); 525 String isfull = landBusinesstypeList.getIsfull();
522 landBusinesstypeList.setProdectTime(new Date()); 526 landBusinesstypeList.setProdectTime(new Date());
  527 + landBusinesstypeList.setBarcode(barCode);
523 landBusinesstypeListService.save(landBusinesstypeList); 528 landBusinesstypeListService.save(landBusinesstypeList);
524 insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList); 529 insertVm(landBusinesstypeList.getMassageId(), landBusinesstypeList.getTrailerFrameNo(), mainfistList);
525 // second 530 // second
526 LandBusinesstypeList list = new LandBusinesstypeList(); 531 LandBusinesstypeList list = new LandBusinesstypeList();
527 list.setAgentname(landBusinesstypeList.getAgentname()); 532 list.setAgentname(landBusinesstypeList.getAgentname());
528 list.setAgentno(landBusinesstypeList.getAgentno()); 533 list.setAgentno(landBusinesstypeList.getAgentno());
  534 + list.setCocode(landBusinesstypeList.getCocode());
529 list.setIsDelete("0"); 535 list.setIsDelete("0");
530 list.setIsvalid("0"); 536 list.setIsvalid("0");
531 list.setIsfull(isfull); 537 list.setIsfull(isfull);
@@ -544,34 +550,13 @@ public class LandBusinesstypeListController extends BaseController { @@ -544,34 +550,13 @@ public class LandBusinesstypeListController extends BaseController {
544 list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel()); 550 list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
545 list.setTurnoverflag("E"); 551 list.setTurnoverflag("E");
546 list.setMassageId(messageId); 552 list.setMassageId(messageId);
  553 + list.setBarcode(barCode);
547 landBusinesstypeListService.save(list); 554 landBusinesstypeListService.save(list);
548 555
549 - String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(), messageId);  
550 - List<LandBusinesstypeList> typeList = landBusinesstypeListService.findByMessageId(messageId);  
551 - int count = 0;  
552 - for (int i = 0; i < typeList.size(); i++) {  
553 - typeList.get(i).setBarcode(barCode);  
554 - landBusinesstypeListService.updateEntry(typeList.get(i));  
555 - count++;  
556 - if (count == typeList.size()) {  
557 - flag = true;  
558 - }  
559 - }  
560 - int countType = 0;  
561 - if (barCode == null) {  
562 - List<LandBusinesstypeList> typeList1 = landBusinesstypeListService.findByMessageId(messageId);  
563 - for (int i = 0; i < typeList1.size(); i++) {  
564 - landBusinesstypeListService.deleteByMessageId(typeList1.get(i));  
565 - countType++;  
566 - if (countType == typeList.size()) {  
567 - flag = false;  
568 - }  
569 - }  
570 - }  
571 } catch (Exception e) { 556 } catch (Exception e) {
572 e.printStackTrace(); 557 e.printStackTrace();
573 } 558 }
574 - return flag; 559 + return true;
575 } 560 }
576 561
577 /* 562 /*
@@ -733,4 +718,40 @@ public class LandBusinesstypeListController extends BaseController { @@ -733,4 +718,40 @@ public class LandBusinesstypeListController extends BaseController {
733 } 718 }
734 } 719 }
735 } 720 }
  721 +
  722 + // @RequiresPermissions("land:landBusinesstypeList:view")
  723 + @RequestMapping(value = "tongji")
  724 + @ResponseBody
  725 + public void tongji() throws ParseException {
  726 + Map<String, Integer> map = new HashMap<>();
  727 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  728 + for (int i = 1; i < 31; i++) {
  729 + String date = null;
  730 + if (i < 10) {
  731 + date = "2019-06-0" + i + " ";
  732 + } else {
  733 + date = "2019-06-" + i + " ";
  734 + }
  735 + for (int j = 0; j < 25; j++) {
  736 + String time = null;
  737 + String time2 = null;
  738 + if (j < 10) {
  739 + time = "0" + j + ":00:00";
  740 + } else {
  741 + time = j + ":00:00";
  742 + }
  743 + if (j + 1 < 10) {
  744 + time2 = "0" + (j + 1) + ":00:00";
  745 + } else {
  746 + time2 = (j + 1) + ":00:00";
  747 + }
  748 +
  749 + List<LandBusinesstypeList> list = landBusinesstypeListService.findBytime(format.parse(date + time),
  750 + format.parse(date + time2));
  751 + map.put(date + time, list.size());
  752 + }
  753 +
  754 + }
  755 + System.out.println(map);
  756 + }
736 } 757 }
1 -/**  
2 - * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.  
3 - */  
4 -package com.thinkgem.jeesite.modules.land.web;  
5 -  
6 -import javax.servlet.http.HttpServletRequest;  
7 -import javax.servlet.http.HttpServletResponse;  
8 -  
9 -import org.apache.shiro.authz.annotation.RequiresPermissions;  
10 -import org.springframework.beans.factory.annotation.Autowired;  
11 -import org.springframework.stereotype.Controller;  
12 -import org.springframework.ui.Model;  
13 -import org.springframework.web.bind.annotation.ModelAttribute;  
14 -import org.springframework.web.bind.annotation.RequestMapping;  
15 -import org.springframework.web.bind.annotation.RequestParam;  
16 -import org.springframework.web.servlet.mvc.support.RedirectAttributes;  
17 -  
18 -import com.thinkgem.jeesite.common.config.Global;  
19 -import com.thinkgem.jeesite.common.persistence.Page;  
20 -import com.thinkgem.jeesite.common.web.BaseController;  
21 -import com.thinkgem.jeesite.common.utils.StringUtils;  
22 -import com.thinkgem.jeesite.modules.land.entity.LandResponseMessage;  
23 -import com.thinkgem.jeesite.modules.land.service.LandResponseMessageService;  
24 -  
25 -/**  
26 - * 回执内容Controller  
27 - * @author zhangfan  
28 - * @version 2018-10-08  
29 - */  
30 -@Controller  
31 -@RequestMapping(value = "${adminPath}/land/landResponseMessage")  
32 -public class LandResponseMessageController extends BaseController {  
33 -  
34 - @Autowired  
35 - private LandResponseMessageService landResponseMessageService;  
36 -  
37 - @ModelAttribute  
38 - public LandResponseMessage get(@RequestParam(required=false) String id) {  
39 - LandResponseMessage entity = null;  
40 - if (StringUtils.isNotBlank(id)){  
41 - entity = landResponseMessageService.get(id);  
42 - }  
43 - if (entity == null){  
44 - entity = new LandResponseMessage();  
45 - }  
46 - return entity;  
47 - }  
48 -  
49 - @RequiresPermissions("land:landResponseMessage:view")  
50 - @RequestMapping(value = {"list", ""})  
51 - public String list(LandResponseMessage landResponseMessage, HttpServletRequest request, HttpServletResponse response, Model model) {  
52 - Page<LandResponseMessage> page = landResponseMessageService.findPage(new Page<LandResponseMessage>(request, response), landResponseMessage);  
53 - model.addAttribute("page", page);  
54 - return "modules/land/landResponseMessageList";  
55 - }  
56 -  
57 - @RequiresPermissions("land:landResponseMessage:view")  
58 - @RequestMapping(value = "form")  
59 - public String form(LandResponseMessage landResponseMessage, Model model) {  
60 - model.addAttribute("landResponseMessage", landResponseMessage);  
61 - return "modules/land/landResponseMessageForm";  
62 - }  
63 -  
64 - @RequiresPermissions("land:landResponseMessage:edit")  
65 - @RequestMapping(value = "save")  
66 - public String save(LandResponseMessage landResponseMessage, Model model, RedirectAttributes redirectAttributes) {  
67 - if (!beanValidator(model, landResponseMessage)){  
68 - return form(landResponseMessage, model);  
69 - }  
70 - landResponseMessageService.save(landResponseMessage);  
71 - addMessage(redirectAttributes, "保存回执成功");  
72 - return "redirect:"+Global.getAdminPath()+"/land/landResponseMessage/?repage";  
73 - }  
74 -  
75 - @RequiresPermissions("land:landResponseMessage:edit")  
76 - @RequestMapping(value = "delete")  
77 - public String delete(LandResponseMessage landResponseMessage, RedirectAttributes redirectAttributes) {  
78 - landResponseMessageService.delete(landResponseMessage);  
79 - addMessage(redirectAttributes, "删除回执成功");  
80 - return "redirect:"+Global.getAdminPath()+"/land/landResponseMessage/?repage";  
81 - }  
82 -  
83 -}  
@@ -3,37 +3,34 @@ @@ -3,37 +3,34 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.web; 4 package com.thinkgem.jeesite.modules.land.web;
5 5
6 -import java.util.ArrayList;  
7 -import java.util.Date;  
8 -import java.util.List;  
9 -  
10 -import javax.servlet.http.HttpServletRequest;  
11 -import javax.servlet.http.HttpServletResponse;  
12 -  
13 -import org.apache.shiro.authz.annotation.RequiresPermissions;  
14 -import org.springframework.beans.factory.annotation.Autowired;  
15 -import org.springframework.stereotype.Controller;  
16 -import org.springframework.ui.Model;  
17 -import org.springframework.web.bind.annotation.ModelAttribute;  
18 -import org.springframework.web.bind.annotation.RequestMapping;  
19 -import org.springframework.web.bind.annotation.RequestParam;  
20 -import org.springframework.web.bind.annotation.ResponseBody;  
21 -import org.springframework.web.servlet.mvc.support.RedirectAttributes;  
22 -  
23 import com.thinkgem.jeesite.common.barCode.buildBarCode; 6 import com.thinkgem.jeesite.common.barCode.buildBarCode;
24 import com.thinkgem.jeesite.common.config.Global; 7 import com.thinkgem.jeesite.common.config.Global;
25 import com.thinkgem.jeesite.common.persistence.Page; 8 import com.thinkgem.jeesite.common.persistence.Page;
26 -import com.thinkgem.jeesite.common.web.BaseController;  
27 import com.thinkgem.jeesite.common.utils.StringUtils; 9 import com.thinkgem.jeesite.common.utils.StringUtils;
  10 +import com.thinkgem.jeesite.common.web.BaseController;
28 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord; 11 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
29 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService; 12 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
30 import com.thinkgem.jeesite.modules.sys.entity.Office; 13 import com.thinkgem.jeesite.modules.sys.entity.Office;
31 -import com.thinkgem.jeesite.modules.sys.entity.Role;  
32 import com.thinkgem.jeesite.modules.sys.entity.User; 14 import com.thinkgem.jeesite.modules.sys.entity.User;
33 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal; 15 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
34 import com.thinkgem.jeesite.modules.sys.service.OfficeService; 16 import com.thinkgem.jeesite.modules.sys.service.OfficeService;
35 import com.thinkgem.jeesite.modules.sys.service.SystemService; 17 import com.thinkgem.jeesite.modules.sys.service.SystemService;
36 import com.thinkgem.jeesite.modules.sys.utils.UserUtils; 18 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.beans.factory.annotation.Autowired;
  21 +import org.springframework.stereotype.Controller;
  22 +import org.springframework.ui.Model;
  23 +import org.springframework.web.bind.annotation.ModelAttribute;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.RequestParam;
  26 +import org.springframework.web.bind.annotation.ResponseBody;
  27 +import org.springframework.web.servlet.mvc.support.RedirectAttributes;
  28 +
  29 +import javax.servlet.http.HttpServletRequest;
  30 +import javax.servlet.http.HttpServletResponse;
  31 +import java.util.ArrayList;
  32 +import java.util.Date;
  33 +import java.util.List;
37 34
38 /** 35 /**
39 * 汽车备案Controller 36 * 汽车备案Controller
@@ -80,8 +77,7 @@ public class LandRoadVeRecordController extends BaseController { @@ -80,8 +77,7 @@ public class LandRoadVeRecordController extends BaseController {
80 List<User> u = systemService.findByOfficeId(office.getId()); 77 List<User> u = systemService.findByOfficeId(office.getId());
81 for (int i = 0; i < u.size(); i++) { 78 for (int i = 0; i < u.size(); i++) {
82 landRoadVeRecord.setCreateBy(u.get(i)); 79 landRoadVeRecord.setCreateBy(u.get(i));
83 - page = landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response),  
84 - landRoadVeRecord); 80 + page = landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response),landRoadVeRecord);
85 lists.addAll(page.getList()); 81 lists.addAll(page.getList());
86 } 82 }
87 page.setCount(lists.size()); 83 page.setCount(lists.size());
@@ -126,10 +122,12 @@ public class LandRoadVeRecordController extends BaseController { @@ -126,10 +122,12 @@ public class LandRoadVeRecordController extends BaseController {
126 if (!beanValidator(model, landRoadVeRecord)) { 122 if (!beanValidator(model, landRoadVeRecord)) {
127 return form(landRoadVeRecord, model); 123 return form(landRoadVeRecord, model);
128 } 124 }
129 - String barcode = landRoadVeRecord.getBarcode();  
130 - 125 + System.out.println(landRoadVeRecord.getDomesticLisenceNo());
  126 + List<LandRoadVeRecord> veList = landRoadVeRecordService.selectByFrameNo(landRoadVeRecord.getDomesticLisenceNo());
  127 + if(veList.size()>0) {
  128 + landRoadVeRecord.setId(veList.get(0).getId());
  129 + }
131 String barCode = buildBarCode.crateCar(landRoadVeRecord); 130 String barCode = buildBarCode.crateCar(landRoadVeRecord);
132 - // String barCode = "111";  
133 if ("0".equals(barCode)) { 131 if ("0".equals(barCode)) {
134 landRoadVeRecord.setReturnmessage("备案成功"); 132 landRoadVeRecord.setReturnmessage("备案成功");
135 } else { 133 } else {
@@ -167,5 +165,12 @@ public class LandRoadVeRecordController extends BaseController { @@ -167,5 +165,12 @@ public class LandRoadVeRecordController extends BaseController {
167 } 165 }
168 return page; 166 return page;
169 } 167 }
170 - 168 + @RequiresPermissions("land:landRoadVeRecord:edit")
  169 + @RequestMapping(value = "change")
  170 + public String change(LandRoadVeRecord landRoadVeRecord, RedirectAttributes redirectAttributes) {
  171 + landRoadVeRecord.setOperationType("1");
  172 + landRoadVeRecordService.save(landRoadVeRecord);
  173 + addMessage(redirectAttributes, "状态更新成功");
  174 + return "redirect:" + Global.getAdminPath() + "/land/landRoadVeRecord/?repage";
  175 + }
171 } 176 }
@@ -69,13 +69,13 @@ public class SystemAuthorizingRealm extends AuthorizingRealm { @@ -69,13 +69,13 @@ public class SystemAuthorizingRealm extends AuthorizingRealm {
69 } 69 }
70 70
71 // 校验登录验证码 71 // 校验登录验证码
72 - if (LoginController.isValidateCodeLogin(token.getUsername(), false, false)){ 72 +/* if (LoginController.isValidateCodeLogin(token.getUsername(), false, false)){
73 Session session = UserUtils.getSession(); 73 Session session = UserUtils.getSession();
74 String code = (String)session.getAttribute(ValidateCodeServlet.VALIDATE_CODE); 74 String code = (String)session.getAttribute(ValidateCodeServlet.VALIDATE_CODE);
75 if (token.getCaptcha() == null || !token.getCaptcha().toUpperCase().equals(code)){ 75 if (token.getCaptcha() == null || !token.getCaptcha().toUpperCase().equals(code)){
76 throw new AuthenticationException("msg:验证码错误, 请重试."); 76 throw new AuthenticationException("msg:验证码错误, 请重试.");
77 } 77 }
78 - } 78 + }*/
79 79
80 // 校验用户名密码 80 // 校验用户名密码
81 User user = getSystemService().getUserByLoginName(token.getUsername()); 81 User user = getSystemService().getUserByLoginName(token.getUsername());
@@ -110,13 +110,13 @@ public class LoginController extends BaseController{ @@ -110,13 +110,13 @@ public class LoginController extends BaseController{
110 sessionDAO.getActiveSessions(false).size(), message, exception); 110 sessionDAO.getActiveSessions(false).size(), message, exception);
111 } 111 }
112 112
113 - // 非授权异常，登录失败，验证码加1。 113 +/* // 非授权异常，登录失败，验证码加1。
114 if (!UnauthorizedException.class.getName().equals(exception)){ 114 if (!UnauthorizedException.class.getName().equals(exception)){
115 model.addAttribute("isValidateCodeLogin", isValidateCodeLogin(username, true, false)); 115 model.addAttribute("isValidateCodeLogin", isValidateCodeLogin(username, true, false));
116 - } 116 + }*/
117 117
118 // 验证失败清空验证码 118 // 验证失败清空验证码
119 - request.getSession().setAttribute(ValidateCodeServlet.VALIDATE_CODE, IdGen.uuid()); 119 + // request.getSession().setAttribute(ValidateCodeServlet.VALIDATE_CODE, IdGen.uuid());
120 120
121 // 如果是手机登录，则返回JSON字符串 121 // 如果是手机登录，则返回JSON字符串
122 if (mobile){ 122 if (mobile){
@@ -73,6 +73,15 @@ @@ -73,6 +73,15 @@
73 </if> 73 </if>
74 order by a.create_date DESC 74 order by a.create_date DESC
75 </select> 75 </select>
  76 + <select id="findByTime" resultType="LandBusinesstypeList">
  77 + select * from land_businesstype_list
  78 + WHERE PRODECT_TIME &gt;=#{time1}
  79 + AND PRODECT_TIME &lt;= #{time2}
  80 + AND ENDSTATION= "4604000000"
  81 + AND AISLE = "4604333311"
  82 + AND IS_DELETE="0"
  83 + ORDER BY PRODECT_TIME;
  84 + </select>
76 <select id="findByMessageId" resultType="LandBusinesstypeList"> 85 <select id="findByMessageId" resultType="LandBusinesstypeList">
77 SELECT 86 SELECT
78 <include refid="landBusinesstypeListColumns"/> 87 <include refid="landBusinesstypeListColumns"/>
@@ -178,6 +187,10 @@ @@ -178,6 +187,10 @@
178 UPDATE land_businesstype_list set is_delete = "1",isvalid = "1" 187 UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
179 WHERE barcode = #{barcode} 188 WHERE barcode = #{barcode}
180 </update> 189 </update>
  190 + <update id="deleteByPrimaryKey" parameterType="java.lang.String">
  191 + DELETE FROM land_businesstype_list
  192 + WHERE id = #{id}
  193 + </update>
181 194
182 <update id="deleteByMessageId" parameterType="java.lang.String"> 195 <update id="deleteByMessageId" parameterType="java.lang.String">
183 DELETE FROM land_businesstype_list 196 DELETE FROM land_businesstype_list
@@ -254,66 +267,42 @@ @@ -254,66 +267,42 @@
254 267
255 <update id="update"> 268 <update id="update">
256 UPDATE land_businesstype_list SET 269 UPDATE land_businesstype_list SET
257 - massage_id = #{massageId},  
258 trailer_frame_no = #{trailerFrameNo}, 270 trailer_frame_no = #{trailerFrameNo},
259 - trailer_license_no = #{trailerLicenseNo},  
260 master_list = #{masterList}, 271 master_list = #{masterList},
261 - prodect_time = #{prodectTime},  
262 - is_delete = #{isDelete},  
263 agentno = #{agentno}, 272 agentno = #{agentno},
264 agentname = #{agentname}, 273 agentname = #{agentname},
265 cocode = #{cocode}, 274 cocode = #{cocode},
266 - drivername = #{drivername},  
267 - driverid = #{driverid},  
268 startport = #{startport}, 275 startport = #{startport},
269 endport = #{endport}, 276 endport = #{endport},
270 startsatation = #{startsatation}, 277 startsatation = #{startsatation},
271 endstation = #{endstation}, 278 endstation = #{endstation},
272 aisle = #{aisle}, 279 aisle = #{aisle},
273 businesstype = #{businesstype}, 280 businesstype = #{businesstype},
274 - turnoverflag = #{turnoverflag},  
275 barcode = #{barcode}, 281 barcode = #{barcode},
276 - contrastflag = #{contrastflag},  
277 update_by = #{updateBy.id}, 282 update_by = #{updateBy.id},
278 update_date = #{updateDate}, 283 update_date = #{updateDate},
279 - isvalid = #{isvalid},  
280 - aislewt = #{aislewt},  
281 - isfull = #{isfull},  
282 - remark = #{remark},  
283 - remark1 = #{remark1},  
284 - remark2 = #{remark2} 284 + isfull = #{isfull}
285 WHERE id = #{id} 285 WHERE id = #{id}
286 </update> 286 </update>
287 <update id="updateEntry"> 287 <update id="updateEntry">
288 UPDATE land_businesstype_list SET 288 UPDATE land_businesstype_list SET
289 - massage_id = #{massageId},  
290 trailer_frame_no = #{trailerFrameNo}, 289 trailer_frame_no = #{trailerFrameNo},
291 - trailer_license_no = #{trailerLicenseNo},  
292 master_list = #{masterList}, 290 master_list = #{masterList},
293 - prodect_time = #{prodectTime},  
294 - is_delete = #{isDelete},  
295 agentno = #{agentno}, 291 agentno = #{agentno},
296 agentname = #{agentname}, 292 agentname = #{agentname},
297 cocode = #{cocode}, 293 cocode = #{cocode},
298 - drivername = #{drivername},  
299 - driverid = #{driverid},  
300 startport = #{startport}, 294 startport = #{startport},
301 endport = #{endport}, 295 endport = #{endport},
302 startsatation = #{startsatation}, 296 startsatation = #{startsatation},
303 endstation = #{endstation}, 297 endstation = #{endstation},
304 aisle = #{aisle}, 298 aisle = #{aisle},
305 - businesstype = #{businesstype},  
306 - turnoverflag = #{turnoverflag},  
307 barcode = #{barcode}, 299 barcode = #{barcode},
308 - contrastflag = #{contrastflag}, 300 + contrastflag=#{contrastflag},
  301 + businesstype = #{businesstype},
309 update_by = #{updateBy.id}, 302 update_by = #{updateBy.id},
310 update_date = #{updateDate}, 303 update_date = #{updateDate},
311 - isvalid = #{isvalid},  
312 - aislewt = #{aislewt},  
313 - isfull = #{isfull},  
314 - remark = #{remark},  
315 - remark1 = #{remark1},  
316 - remark2 = #{remark2} 304 + isvalid=#{isvalid},
  305 + isfull = #{isfull}
317 WHERE id = #{id} 306 WHERE id = #{id}
318 </update> 307 </update>
319 308
@@ -298,6 +298,9 @@ th, td { @@ -298,6 +298,9 @@ th, td {
298 </div> 298 </div>
299 </div> 299 </div>
300 <div class="control-group"> 300 <div class="control-group">
  301 + <div class="row-fluid">
  302 + <div class="span12">
  303 + <div class="span6">
301 <label class="control-label">是否空车：</label> 304 <label class="control-label">是否空车：</label>
302 <div class="controls"> 305 <div class="controls">
303 <form:select path="isfull" class="input-xlarge"> 306 <form:select path="isfull" class="input-xlarge">
@@ -307,6 +310,23 @@ th, td { @@ -307,6 +310,23 @@ th, td {
307 </form:select> 310 </form:select>
308 </div> 311 </div>
309 </div> 312 </div>
  313 + <div class="span6">
  314 + <label class="control-label">货物类型：</label>
  315 + <div class="controls">
  316 + <form:select path="cocode" class="input-xlarge">
  317 + <form:option value="" label="--请选择--" />
  318 + <form:option value="转关货" label="转关货"/>
  319 + <form:option value="换单货" label="换单货"/>
  320 + <form:option value="普通货" label="普通货"/>
  321 + <form:option value="退库货" label="退库货"/>
  322 + <form:option value="查验货" label="查验货"/>
  323 + </form:select>
  324 + <span class="help-inline"><font color="red">*</font></span>
  325 + </div>
  326 + </div>
  327 + </div>
  328 + </div>
  329 + </div>
310 <div class="control-group"> 330 <div class="control-group">
311 <label class="control-label">主单列表：</label> 331 <label class="control-label">主单列表：</label>
312 <div class="controls"> 332 <div class="controls">
@@ -447,8 +467,8 @@ th, td { @@ -447,8 +467,8 @@ th, td {
447 }else if(ieType=="出口送货" | ieType=="调拨业务"){ 467 }else if(ieType=="出口送货" | ieType=="调拨业务"){
448 ieType="E"; 468 ieType="E";
449 } 469 }
450 - var url = "http://tjfx.15miaoo.com:8003/tj/orig/orig";  
451 - //var url = "http://10.50.3.64:8080/tj/orig/orig"; 470 + var url = "http://tjfx.15miaoo.com:8003/orig/orig";
  471 + // var url = "http://10.50.3.64:8080/tj/orig/orig";
452 var xhr = new XMLHttpRequest(); 472 var xhr = new XMLHttpRequest();
453 // 访问nginx中的代理服务器 473 // 访问nginx中的代理服务器
454 xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true); 474 xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
@@ -459,9 +479,8 @@ th, td { @@ -459,9 +479,8 @@ th, td {
459 var flightNo = ""; 479 var flightNo = "";
460 var flightDate = ""; 480 var flightDate = "";
461 var data = JSON.parse(xhr.responseText); 481 var data = JSON.parse(xhr.responseText);
  482 + if(data.length>0){
462 for(var i = 0;i<data.length;i++ ){ 483 for(var i = 0;i<data.length;i++ ){
463 - console.log(data[i])  
464 - console.log()  
465 if(data[i].receiptinformation!=undefined){ 484 if(data[i].receiptinformation!=undefined){
466 if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 || 485 if(data[i].receiptinformation.indexOf("41301")!=-1 || data[i].receiptinformation.indexOf("41106")!=-1 ||
467 data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 || 486 data[i].receiptinformation.indexOf("31301")!=-1 || data[i].receiptinformation.indexOf("31106")!=-1 ||
@@ -491,6 +510,9 @@ th, td { @@ -491,6 +510,9 @@ th, td {
491 } 510 }
492 511
493 } 512 }
  513 + }else {
  514 + alert("请确认单号是否为郑州关进出口单号")
  515 + }
494 } 516 }
495 } 517 }
496 } 518 }
@@ -86,6 +86,9 @@ @@ -86,6 +86,9 @@
86 <shiro:hasAnyRoles name="dept,admin,leader"> 86 <shiro:hasAnyRoles name="dept,admin,leader">
87 <th>操作</th> 87 <th>操作</th>
88 </shiro:hasAnyRoles> 88 </shiro:hasAnyRoles>
  89 + <shiro:hasRole name="dept">
  90 + <th>是否失效</th>
  91 + </shiro:hasRole>
89 <th>车牌号</th> 92 <th>车牌号</th>
90 <th>挂靠单位</th> 93 <th>挂靠单位</th>
91 <th>目的海关代码</th> 94 <th>目的海关代码</th>
@@ -96,6 +99,7 @@ @@ -96,6 +99,7 @@
96 <th>进出差值</th> 99 <th>进出差值</th>
97 <th>备案车重</th> 100 <th>备案车重</th>
98 <th>业务类型</th> 101 <th>业务类型</th>
  102 + <th>货物类型</th>
99 <th>二维码编号</th> 103 <th>二维码编号</th>
100 <th>进出场站</th> 104 <th>进出场站</th>
101 <th>已进已出</th> 105 <th>已进已出</th>
@@ -111,6 +115,12 @@ @@ -111,6 +115,12 @@
111 <a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">查看</a> 115 <a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">查看</a>
112 </td> 116 </td>
113 </shiro:hasAnyRoles> 117 </shiro:hasAnyRoles>
  118 + <shiro:hasRole name="dept">
  119 + <td>
  120 + <c:if test="${landBusinesstypeList.isvalid =='1'}">失效</c:if>
  121 + <c:if test="${landBusinesstypeList.isvalid =='0'}">未失效</c:if>
  122 + </td>
  123 + </shiro:hasRole>
114 <td>${landBusinesstypeList.trailerFrameNo}</td> 124 <td>${landBusinesstypeList.trailerFrameNo}</td>
115 <td>${landBusinesstypeList.agentname}</td> 125 <td>${landBusinesstypeList.agentname}</td>
116 <td>${landBusinesstypeList.endport}</td> 126 <td>${landBusinesstypeList.endport}</td>
@@ -134,6 +144,7 @@ @@ -134,6 +144,7 @@
134 <td>${landBusinesstypeList.remark1}</td> 144 <td>${landBusinesstypeList.remark1}</td>
135 <td>${landBusinesstypeList.remark2}</td> 145 <td>${landBusinesstypeList.remark2}</td>
136 <td>${landBusinesstypeList.businesstype}</td> 146 <td>${landBusinesstypeList.businesstype}</td>
  147 + <td>${landBusinesstypeList.cocode}</td>
137 <td>${landBusinesstypeList.barcode}</td> 148 <td>${landBusinesstypeList.barcode}</td>
138 <td> 149 <td>
139 <c:if test="${landBusinesstypeList.turnoverflag =='E'}">出场站</c:if> 150 <c:if test="${landBusinesstypeList.turnoverflag =='E'}">出场站</c:if>
@@ -147,8 +158,8 @@ @@ -147,8 +158,8 @@
147 <c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}"> 158 <c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
148 <a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a> 159 <a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a>
149 <a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a> 160 <a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a>
150 - <shiro:hasAnyRoles name="dept,admin.leader">  
151 - <a href="${ctx}/land/landBusinesstypeList/update?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要更新异常吗？', this.href)">异常处理</a> 161 + <shiro:hasAnyRoles name="dept,admin,leader">
  162 + <a href="${ctx}/land/landBusinesstypeList/updateError?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要更新异常吗？', this.href)">异常处理</a>
152 </shiro:hasAnyRoles> 163 </shiro:hasAnyRoles>
153 </c:if> 164 </c:if>
154 </td></shiro:hasPermission> 165 </td></shiro:hasPermission>
@@ -205,7 +205,7 @@ input { @@ -205,7 +205,7 @@ input {
205 </form:select> 205 </form:select>
206 </div> 206 </div>
207 </div> 207 </div>
208 - <div class="control-group"> 208 +<%-- <div class="control-group">
209 <h4>运输服务企业信息</h4> 209 <h4>运输服务企业信息</h4>
210 </div> 210 </div>
211 <div class="control-group"> 211 <div class="control-group">
@@ -475,7 +475,7 @@ input { @@ -475,7 +475,7 @@ input {
475 itemValue="value" htmlEscape="false" /> 475 itemValue="value" htmlEscape="false" />
476 </form:select> 476 </form:select>
477 </div> 477 </div>
478 - </div> 478 + </div> --%>
479 <div class="control-group"> 479 <div class="control-group">
480 <label class="row-lable">备注：</label> 480 <label class="row-lable">备注：</label>
481 <div class="row-controls"> 481 <div class="row-controls">
@@ -54,49 +54,71 @@ @@ -54,49 +54,71 @@
54 <h4>驾驶员信息</h4> 54 <h4>驾驶员信息</h4>
55 </div> 55 </div>
56 <div class="control-group"> 56 <div class="control-group">
  57 + <div class="row-fluid">
  58 + <div class="span12">
  59 + <div class="span4">
57 <label class="control-label">主管海关代码：</label> 60 <label class="control-label">主管海关代码：</label>
58 <div class="controls"> 61 <div class="controls">
59 <form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/> 62 <form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/>
60 </div> 63 </div>
61 </div> 64 </div>
62 - <div class="control-group"> 65 + <div class="span4">
63 <label class="control-label">所在企业代码：</label> 66 <label class="control-label">所在企业代码：</label>
64 <div class="controls"> 67 <div class="controls">
65 <form:input path="coCode" htmlEscape="false" maxlength="32" class="input-xlarge "/> 68 <form:input path="coCode" htmlEscape="false" maxlength="32" class="input-xlarge "/>
66 </div> 69 </div>
67 </div> 70 </div>
  71 + </div>
  72 + </div>
  73 + </div>
  74 +<%-- <div class="control-group">
  75 + <label class="control-label">国籍：</label>
  76 + <div class="controls">
  77 + <form:input path="nationality" htmlEscape="false" maxlength="2" class="input-medium "/>
  78 + </div>
  79 + </div> --%>
68 80
69 <div class="control-group"> 81 <div class="control-group">
  82 + <div class="row-fluid">
  83 + <div class="span12">
  84 + <div class="span4">
70 <label class="control-label">身份证号/护照号：</label> 85 <label class="control-label">身份证号/护照号：</label>
71 <div class="controls"> 86 <div class="controls">
72 <form:input path="idCard" htmlEscape="false" maxlength="18" class="input-xlarge "/> 87 <form:input path="idCard" htmlEscape="false" maxlength="18" class="input-xlarge "/>
73 </div> 88 </div>
74 </div> 89 </div>
75 - <div class="control-group"> 90 + <div class="span4">
76 <label class="control-label">驾驶员姓名：</label> 91 <label class="control-label">驾驶员姓名：</label>
77 <div class="controls"> 92 <div class="controls">
78 <form:input path="drName" htmlEscape="false" maxlength="20" class="input-large "/> 93 <form:input path="drName" htmlEscape="false" maxlength="20" class="input-large "/>
79 </div> 94 </div>
80 </div> 95 </div>
81 - <div class="control-group">  
82 - <label class="control-label">国籍：</label>  
83 - <div class="controls">  
84 - <form:input path="nationality" htmlEscape="false" maxlength="2" class="input-medium "/> 96 +
  97 + </div>
85 </div> 98 </div>
86 </div> 99 </div>
87 <div class="control-group"> 100 <div class="control-group">
  101 + <div class="row-fluid">
  102 + <div class="span12">
  103 + <div class="span4">
88 <label class="control-label">籍贯：</label> 104 <label class="control-label">籍贯：</label>
89 <div class="controls"> 105 <div class="controls">
90 <form:input path="drNative" htmlEscape="false" maxlength="20" class="input-medium "/> 106 <form:input path="drNative" htmlEscape="false" maxlength="20" class="input-medium "/>
91 </div> 107 </div>
92 </div> 108 </div>
93 - <div class="control-group"> 109 + <div class="span4">
94 <label class="control-label">性别：</label> 110 <label class="control-label">性别：</label>
95 <div class="controls"> 111 <div class="controls">
96 <form:input path="gender" htmlEscape="false" maxlength="1" class="input-medium "/> 112 <form:input path="gender" htmlEscape="false" maxlength="1" class="input-medium "/>
97 </div> 113 </div>
98 </div> 114 </div>
  115 + </div>
  116 + </div>
  117 + </div>
99 <div class="control-group"> 118 <div class="control-group">
  119 + <div class="row-fluid">
  120 + <div class="span12">
  121 + <div class="span4">
100 <label class="control-label">出生日期：</label> 122 <label class="control-label">出生日期：</label>
101 <div class="controls"> 123 <div class="controls">
102 <input name="birthday" type="text" readonly="readonly" maxlength="20" class="input-large Wdate " 124 <input name="birthday" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
@@ -104,28 +126,25 @@ @@ -104,28 +126,25 @@
104 onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> 126 onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
105 </div> 127 </div>
106 </div> 128 </div>
107 - <div class="control-group"> 129 + <div class="span4">
108 <label class="control-label">居住地址：</label> 130 <label class="control-label">居住地址：</label>
109 <div class="controls"> 131 <div class="controls">
110 <form:input path="liveAddr" htmlEscape="false" maxlength="255" class="input-xlarge "/> 132 <form:input path="liveAddr" htmlEscape="false" maxlength="255" class="input-xlarge "/>
111 </div> 133 </div>
112 </div> 134 </div>
113 - <div class="control-group">  
114 - <label class="control-label">最新更新申请业务类型：</label>  
115 - <div class="controls">  
116 - <form:select path="currApplyBussiness" class="input-xlarge ">  
117 - <form:option value="" label=""/>  
118 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>  
119 - </form:select> 135 + </div>
120 </div> 136 </div>
121 </div> 137 </div>
122 <div class="control-group"> 138 <div class="control-group">
  139 + <div class="row-fluid">
  140 + <div class="span12">
  141 + <div class="span4">
123 <label class="control-label">申请人：</label> 142 <label class="control-label">申请人：</label>
124 <div class="controls"> 143 <div class="controls">
125 <form:input path="proposer" htmlEscape="false" maxlength="32" class="input-xlarge "/> 144 <form:input path="proposer" htmlEscape="false" maxlength="32" class="input-xlarge "/>
126 </div> 145 </div>
127 </div> 146 </div>
128 - <div class="control-group"> 147 + <div class="span4">
129 <label class="control-label">申请时间：</label> 148 <label class="control-label">申请时间：</label>
130 <div class="controls"> 149 <div class="controls">
131 <input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate " 150 <input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
@@ -133,7 +152,13 @@ @@ -133,7 +152,13 @@
133 onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/> 152 onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
134 </div> 153 </div>
135 </div> 154 </div>
  155 + </div>
  156 + </div>
  157 + </div>
136 <div class="control-group"> 158 <div class="control-group">
  159 + <div class="row-fluid">
  160 + <div class="span12">
  161 + <div class="span4">
137 <label class="control-label">驾驶员分类：</label> 162 <label class="control-label">驾驶员分类：</label>
138 <div class="controls"> 163 <div class="controls">
139 <form:select path="drClassFlag" class="input-xlarge "> 164 <form:select path="drClassFlag" class="input-xlarge ">
@@ -145,35 +170,20 @@ @@ -145,35 +170,20 @@
145 </form:select> 170 </form:select>
146 </div> 171 </div>
147 </div> 172 </div>
148 - <div class="control-group">  
149 - <label class="control-label">数据操作类型：</label>  
150 - <div class="controls">  
151 - <form:select path="operationType" class="input-xlarge ">  
152 - <form:option value="" label=""/>  
153 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>  
154 - </form:select>  
155 - </div>  
156 - </div>  
157 - <div class="control-group">  
158 - <label class="control-label">驾驶员照片：</label>  
159 - <div class="controls">  
160 - <form:input path="drPic" htmlEscape="false" maxlength="255" class="input-xlarge "/>  
161 - </div>  
162 - </div>  
163 - <div class="control-group">  
164 - <label class="control-label">备注：</label>  
165 - <div class="controls">  
166 - <form:input path="memo" htmlEscape="false" maxlength="512" class="input-xlarge "/>  
167 - </div>  
168 - </div>  
169 - <div class="control-group"> 173 + <div class="span4">
170 <label class="control-label">驾车资格编号：</label> 174 <label class="control-label">驾车资格编号：</label>
171 <div class="controls"> 175 <div class="controls">
172 <form:input path="quaId" htmlEscape="false" maxlength="32" class="input-xlarge required"/> 176 <form:input path="quaId" htmlEscape="false" maxlength="32" class="input-xlarge required"/>
173 <span class="help-inline"><font color="red">*</font> </span> 177 <span class="help-inline"><font color="red">*</font> </span>
174 </div> 178 </div>
175 </div> 179 </div>
  180 + </div>
  181 + </div>
  182 + </div>
176 <div class="control-group"> 183 <div class="control-group">
  184 + <div class="row-fluid">
  185 + <div class="span12">
  186 + <div class="span4">
177 <label class="control-label">驾车资格：</label> 187 <label class="control-label">驾车资格：</label>
178 <div class="controls"> 188 <div class="controls">
179 <form:select path="drQua" class="input-xlarge "> 189 <form:select path="drQua" class="input-xlarge ">
@@ -186,7 +196,41 @@ @@ -186,7 +196,41 @@
186 </form:select> 196 </form:select>
187 </div> 197 </div>
188 </div> 198 </div>
  199 + <div class="span4">
  200 + <label class="control-label">备注：</label>
  201 + <div class="controls">
  202 + <form:input path="memo" htmlEscape="false" maxlength="512" class="input-xlarge "/>
  203 + </div>
  204 + </div>
  205 + </div>
  206 + </div>
  207 + </div>
  208 + <%-- <div class="control-group">
  209 + <label class="control-label">最新更新申请业务类型：</label>
  210 + <div class="controls">
  211 + <form:select path="currApplyBussiness" class="input-xlarge ">
  212 + <form:option value="" label=""/>
  213 + <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
  214 + </form:select>
  215 + </div>
  216 + </div> --%>
  217 + <%-- <div class="control-group">
  218 + <label class="control-label">数据操作类型：</label>
  219 + <div class="controls">
  220 + <form:select path="operationType" class="input-xlarge ">
  221 + <form:option value="" label=""/>
  222 + <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
  223 + </form:select>
  224 + </div>
  225 + </div>
189 <div class="control-group"> 226 <div class="control-group">
  227 + <label class="control-label">驾驶员照片：</label>
  228 + <div class="controls">
  229 + <form:input path="drPic" htmlEscape="false" maxlength="255" class="input-xlarge "/>
  230 + </div>
  231 + </div> --%>
  232 +
  233 + <%-- <div class="control-group">
190 <label class="control-label">批文编号（N）：</label> 234 <label class="control-label">批文编号（N）：</label>
191 <div class="controls"> 235 <div class="controls">
192 <form:input path="apprNo" htmlEscape="false" maxlength="32" class="input-xlarge "/> 236 <form:input path="apprNo" htmlEscape="false" maxlength="32" class="input-xlarge "/>
@@ -210,8 +254,8 @@ @@ -210,8 +254,8 @@
210 onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> 254 onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
211 </div> 255 </div>
212 </div> 256 </div>
213 -  
214 - <span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span> 257 + --%>
  258 + <!-- <span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span> -->
215 <div class="form-actions"> 259 <div class="form-actions">
216 <shiro:hasPermission name="land:landRoadDrRecord:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission> 260 <shiro:hasPermission name="land:landRoadDrRecord:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
217 <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> 261 <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
@@ -127,7 +127,7 @@ input { @@ -127,7 +127,7 @@ input {
127 <label class="row-lable">行驶证有效期：</label> 127 <label class="row-lable">行驶证有效期：</label>
128 <span class="row-controls"> 128 <span class="row-controls">
129 <input name="veFactoryDate" type="text" 129 <input name="veFactoryDate" type="text"
130 - maxlength="20" class="input-medium Wdate required" 130 + maxlength="20" class="input-medium Wdate"
131 value="<fmt:formatDate value="${landRoadVeRecord.veFactoryDate}" pattern="yyyy-MM-dd"/>" 131 value="<fmt:formatDate value="${landRoadVeRecord.veFactoryDate}" pattern="yyyy-MM-dd"/>"
132 onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" /> 132 onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
133 <span class="help-inline"><font color="red">*</font></span> 133 <span class="help-inline"><font color="red">*</font></span>
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
47 <th>自重</th> 47 <th>自重</th>
48 <th>载重</th> 48 <th>载重</th>
49 <th>备案结果</th> 49 <th>备案结果</th>
  50 + <th>申报状态</th>
50 <th>更新时间</th> 51 <th>更新时间</th>
51 <shiro:hasPermission name="land:landRoadVeRecord:edit"><th>操作</th></shiro:hasPermission> 52 <shiro:hasPermission name="land:landRoadVeRecord:edit"><th>操作</th></shiro:hasPermission>
52 </tr> 53 </tr>
@@ -64,13 +65,18 @@ @@ -64,13 +65,18 @@
64 <td>${landRoadVeRecord.selfWt }</td> 65 <td>${landRoadVeRecord.selfWt }</td>
65 <td>${landRoadVeRecord.veTon }</td> 66 <td>${landRoadVeRecord.veTon }</td>
66 <td>${landRoadVeRecord.returnmessage }</td> 67 <td>${landRoadVeRecord.returnmessage }</td>
67 - <td><a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}"> 68 + <td>
  69 + <c:if test="${landRoadVeRecord.operationType=='1' }">审批通过</c:if>
  70 + <c:if test="${landRoadVeRecord.operationType=='0' }">需手动审批</c:if>
  71 + </td>
  72 + <td>
68 <fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/> 73 <fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
69 </a></td> 74 </a></td>
70 <shiro:hasPermission name="land:landRoadVeRecord:edit"><td> 75 <shiro:hasPermission name="land:landRoadVeRecord:edit"><td>
71 <a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a> 76 <a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">修改</a>
72 <shiro:hasAnyRoles name="dept,admin,leader"> 77 <shiro:hasAnyRoles name="dept,admin,leader">
73 <a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a> 78 <a href="${ctx}/land/landRoadVeRecord/delete?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要删除该备案吗？', this.href)">删除</a>
  79 + <a href="${ctx}/land/landRoadVeRecord/change?id=${landRoadVeRecord.id}" onclick="return confirmx('确认要审批吗？', this.href)">审批</a>
74 </shiro:hasAnyRoles> 80 </shiro:hasAnyRoles>
75 </td></shiro:hasPermission> 81 </td></shiro:hasPermission>
76 </tr> 82 </tr>
@@ -165,8 +165,8 @@ @@ -165,8 +165,8 @@
165 <ul class="dropdown-menu"> 165 <ul class="dropdown-menu">
166 <li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; 个人信息</a></li> 166 <li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; 个人信息</a></li>
167 <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> 167 <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
168 - <li><a href="${ctx}/oa/oaNotify/self" target="mainFrame"><i class="icon-bell"></i>&nbsp; 我的通知 <span id="notifyNum2" class="label label-info hide"></span></a></li>  
169 - </ul> 168 +<%-- <li><a href="${ctx}/oa/oaNotify/self" target="mainFrame"><i class="icon-bell"></i>&nbsp; 我的通知 <span id="notifyNum2" class="label label-info hide"></span></a></li>
  169 + --%> </ul>
170 </li> 170 </li>
171 <li><a href="${ctx}/logout" title="退出登录">退出</a></li> 171 <li><a href="${ctx}/logout" title="退出登录">退出</a></li>
172 <li>&nbsp;</li> 172 <li>&nbsp;</li>
@@ -5,26 +5,28 @@ @@ -5,26 +5,28 @@
5 <head> 5 <head>
6 <title>${fns:getConfig('productName')} 登录</title> 6 <title>${fns:getConfig('productName')} 登录</title>
7 <meta name="decorator" content="blank"/> 7 <meta name="decorator" content="blank"/>
8 - <style type="text/css">  
9 - html,body,table{background-color:#f5f5f5;width:100%;text-align:center;}.form-signin-heading{font-family:Helvetica, Georgia, Arial, sans-serif, 黑体;font-size:36px;margin-bottom:20px;color:#0663a2;}  
10 - .form-signin{position:relative;text-align:left;width:300px;padding:25px 29px 29px;margin:0 auto 20px;background-color:#fff;border:1px solid #e5e5e5; 8 +<!-- <style type="text/css">
  9 + html,body,table{background-color:#3E75C0;width:100%;text-align:center;}.form-signin-heading{font-family:Helvetica, Georgia, Arial, sans-serif, 黑体;font-size:36px;margin-bottom:20px;color:#0663a2;}
  10 + .form-signin{position:absolute;text-align:left;width:300px;padding:25px 29px 29px;margin:0 auto 20px;border:0;background:none;box-shadow:none;
11 -webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05);} 11 -webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05);}
12 - .form-signin .checkbox{margin-bottom:10px;color:#0663a2;} .form-signin .input-label{font-size:16px;line-height:23px;color:#999;} 12 + .form-signin .checkbox{margin-bottom:10px;color:#0663a2;} .form-signin .input-label{font-size:16px;line-height:23px;color:#fff;}
13 .form-signin .input-block-level{font-size:16px;height:auto;margin-bottom:15px;padding:7px;*width:283px;*padding-bottom:0;_padding:7px 7px 9px 7px;} 13 .form-signin .input-block-level{font-size:16px;height:auto;margin-bottom:15px;padding:7px;*width:283px;*padding-bottom:0;_padding:7px 7px 9px 7px;}
14 .form-signin .btn.btn-large{font-size:16px;} .form-signin #themeSwitch{position:absolute;right:15px;bottom:10px;} 14 .form-signin .btn.btn-large{font-size:16px;} .form-signin #themeSwitch{position:absolute;right:15px;bottom:10px;}
15 .form-signin div.validateCode {padding-bottom:15px;} .mid{vertical-align:middle;} 15 .form-signin div.validateCode {padding-bottom:15px;} .mid{vertical-align:middle;}
16 - .header{height:80px;padding-top:20px;} .alert{position:relative;width:300px;margin:0 auto;*padding-bottom:0px;} 16 + .header{height:80px;padding-top:20px;} .footer{position:absolute;} .footer, .footer a{color:#779ACA}
  17 + .alert{position:relative;width:300px;margin:0 auto;*padding-bottom:0px;}
17 label.error{background:none;width:270px;font-weight:normal;color:inherit;margin:0;} 18 label.error{background:none;width:270px;font-weight:normal;color:inherit;margin:0;}
18 - </style> 19 + body{background:url(${ctxStatic}/images/login_bg.jpg) no-repeat center center;}
  20 + </style> -->
19 <script type="text/javascript"> 21 <script type="text/javascript">
20 $(document).ready(function() { 22 $(document).ready(function() {
21 $("#loginForm").validate({ 23 $("#loginForm").validate({
22 - rules: { 24 + /* rules: {
23 validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"} 25 validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"}
24 - }, 26 + }, */
25 messages: { 27 messages: {
26 - username: {required: "请填写用户名."},password: {required: "请填写密码."},  
27 - validateCode: {remote: "验证码不正确.", required: "请填写验证码."} 28 + username: {required: "请填写用户名."},password: {required: "请填写密码."}
  29 + /* validateCode: {remote: "验证码不正确.", required: "请填写验证码."} */
28 }, 30 },
29 errorLabelContainer: "#messageBox", 31 errorLabelContainer: "#messageBox",
30 errorPlacement: function(error, element) { 32 errorPlacement: function(error, element) {
@@ -37,17 +39,30 @@ @@ -37,17 +39,30 @@
37 alert('未登录或登录超时。请重新登录，谢谢！'); 39 alert('未登录或登录超时。请重新登录，谢谢！');
38 top.location = "${ctx}"; 40 top.location = "${ctx}";
39 } 41 }
40 - </script> 42 +</script>
  43 +<style type="text/css">
  44 +
  45 + body {
  46 + background:#3c7fb5 url(${ctxStatic}/images/bg_login.jpg) repeat-x left top;
  47 + }
  48 +/* body,table,td,div {
  49 + font-size: 12px;
  50 + line-height: 24px;
  51 + } */
  52 + .textfile {
  53 + height: 29px;
  54 + width: 143px;
  55 + }
  56 +</style>
41 </head> 57 </head>
42 <body> 58 <body>
43 - <!--[if lte IE 6]><br/><div class='alert alert-block' style="text-align:left;padding-bottom:10px;"><a class="close" data-dismiss="alert">x</a><h4>温馨提示：</h4><p>你使用的浏览器版本过低。为了获得更好的浏览体验，我们强烈建议您 <a href="http://browsehappy.com" target="_blank">升级</a> 到最新版本的IE浏览器，或者使用较新版本的 Chrome、Firefox、Safari 等。</p></div><![endif]-->  
44 <div class="header"> 59 <div class="header">
45 <div id="messageBox" class="alert alert-error ${empty message ? 'hide' : ''}"><button data-dismiss="alert" class="close">×</button> 60 <div id="messageBox" class="alert alert-error ${empty message ? 'hide' : ''}"><button data-dismiss="alert" class="close">×</button>
46 <label id="loginError" class="error">${message}</label> 61 <label id="loginError" class="error">${message}</label>
47 </div> 62 </div>
48 </div> 63 </div>
49 - <h1 class="form-signin-heading">${fns:getConfig('productName')}</h1>  
50 - <form id="loginForm" class="form-signin" action="${ctx}/login" method="post"> 64 + <%-- <h1 class="form-signin-heading">${fns:getConfig('productName')}</h1> --%>
  65 +<%-- <form id="loginForm" class="form-signin" action="${ctx}/login" method="post">
51 <label class="input-label" for="username">登录名</label> 66 <label class="input-label" for="username">登录名</label>
52 <input type="text" id="username" name="username" class="input-block-level required" value="${username}"> 67 <input type="text" id="username" name="username" class="input-block-level required" value="${username}">
53 <label class="input-label" for="password">密码</label> 68 <label class="input-label" for="password">密码</label>
@@ -55,8 +70,8 @@ @@ -55,8 +70,8 @@
55 <c:if test="${isValidateCodeLogin}"><div class="validateCode"> 70 <c:if test="${isValidateCodeLogin}"><div class="validateCode">
56 <label class="input-label mid" for="validateCode">验证码</label> 71 <label class="input-label mid" for="validateCode">验证码</label>
57 <sys:validateCode name="validateCode" inputCssStyle="margin-bottom:0;"/> 72 <sys:validateCode name="validateCode" inputCssStyle="margin-bottom:0;"/>
58 - </div></c:if><%--  
59 - <label for="mobile" title="手机登录"><input type="checkbox" id="mobileLogin" name="mobileLogin" ${mobileLogin ? 'checked' : ''}/></label> --%> 73 + </div></c:if>
  74 + <label for="mobile" title="手机登录"><input type="checkbox" id="mobileLogin" name="mobileLogin" ${mobileLogin ? 'checked' : ''}/></label>
60 <input class="btn btn-large btn-primary" type="submit" value="登 录"/>&nbsp;&nbsp; 75 <input class="btn btn-large btn-primary" type="submit" value="登 录"/>&nbsp;&nbsp;
61 <label for="rememberMe" title="下次不需要再登录"><input type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''}/> 记住我（公共场所慎用）</label> 76 <label for="rememberMe" title="下次不需要再登录"><input type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''}/> 记住我（公共场所慎用）</label>
62 <div id="themeSwitch" class="dropdown"> 77 <div id="themeSwitch" class="dropdown">
@@ -69,6 +84,67 @@ @@ -69,6 +84,67 @@
69 </form> 84 </form>
70 <div class="footer"> 85 <div class="footer">
71 Copyright &copy; ${fns:getConfig('copyrightYear')} <a href="${pageContext.request.contextPath}${fns:getFrontPath()}">${fns:getConfig('productName')}</a> - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')} 86 Copyright &copy; ${fns:getConfig('copyrightYear')} <a href="${pageContext.request.contextPath}${fns:getFrontPath()}">${fns:getConfig('productName')}</a> - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')}
  87 + </div> --%>
  88 + <div class="loginTable">
  89 + <table width="596" border="0" align="center" cellpadding="0" cellspacing="0">
  90 + <tr>
  91 + <td width="596" height="331" background="${ctxStatic}/images/top_login.jpg" ></td>
  92 + </tr>
  93 + <tr>
  94 + <td>
  95 + <table width="100%" border="0" cellspacing="0" cellpadding="0">
  96 + <tr height="139">
  97 + <td width="99" background="${ctxStatic}/images/login_06.jpg"height="139" ></td>
  98 + <td background="${ctxStatic}/images/bg_form.jpg" height="139">
  99 + <table width="250" border="0" align="center" cellpadding="0" cellspacing="0">
  100 + <form id="loginForm" action="${ctx}/login" method="post">
  101 + <tr>
  102 + <td height="35" align="right">用户名：</td>
  103 + <td>
  104 + <label>
  105 + <input name="username" type="text" maxlength="20" id="txtUserName" class="textfile" />
  106 + <span id="UserNameRequired" style="color:Red;visibility:hidden;">必填*</span>
  107 + </label>
  108 + </td>
  109 + </tr>
  110 + <tr>
  111 + <td height="35" align="right">密&nbsp;&nbsp;码：</td>
  112 + <td><label>
  113 + <input name="password" type="password" maxlength="30" id="txtPassword" class="textfile" />
  114 + <span id="PasswordRequired" style="color:Red;visibility:hidden;">必填*</span>
  115 + </label></td>
  116 + </tr>
  117 + <tr>
  118 + <td height="35">&nbsp;</td>
  119 + <td><label>
  120 + <input class="btn btn-min btn-primary" type="submit" value="登 录"/>&nbsp;&nbsp;
  121 + </label></td>
  122 + </tr>
  123 + <!-- <tr>
  124 + <td height="30">&nbsp;</td>
  125 + <td>&nbsp;</td>
  126 + </tr> -->
  127 + </form>
  128 + </table>
  129 + </td>
  130 + <td width="98" height="139" align="right" background="${ctxStatic}/images/login_08.jpg" ></td>
  131 + </tr>
  132 + </table>
  133 + </td>
  134 + </tr>
  135 + <tr>
  136 + <td background="${ctxStatic}/images/bottom_login.jpg" width="596" height="39" align="center">
  137 + <span id="lbMessage" style="display:inline-block;color:Red;width:350px;"></span>
  138 + </td>
  139 +
  140 + </tr>
  141 + <tr>
  142 + <td>&nbsp;</td>
  143 + </tr>
  144 + <!-- <tr>
  145 + <td align="center" style="color:White"><b>三宝科技@版权所有</b></td>
  146 + </tr> -->
  147 + </table>
72 </div> 148 </div>
73 <script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script> 149 <script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
74 </body> 150 </body>