git-svn-id: https://192.168.57.71/svn/jsgkj@1092 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxgl/dao/HxglDao.java

@@ -12,13 +12,13 @@ public interface HxglDao extends SecRepository<HxglEntity, String> {
 	@Query(value = "SELECT * from GK_OPERATION_JSJY_GGFWXX_HX t  where t.rq =?1 and t.RECORD_STATUS<>9", nativeQuery = true)
 	public List<HxglEntity> findByRq(String rq);
 
-	@Query(value = "select sum(t1.a+t1.b),sum(t1.a),sum(t1.b) from (SELECT t.bynmwcl a,t.bywmwcl b from GK_OPERATION_JSJY_GGFWXX_HX t  where t.rq like ?1% and t.szgk like ?2% and sfth='202' and t.RECORD_STATUS<>9) t1", nativeQuery = true)
+	@Query(value = "select sum(t1.a + t1.b), sum(t1.a), sum(t1.b) from (SELECT t.nmjzxttl a, t.wmjzxttl b from GK_OPERATION_JSJY_HXHBGL t  where to_char(t.year||'-'||t.month) = ?1 and t.szgk = ?2 and t.RECORD_STATUS <> 9) t1", nativeQuery = true)
 	public Object bywcltj(String rq, String szgk);
 
-	@Query(value = "select sum(t1.a+t1.b),sum(t1.a),sum(t1.b) from (SELECT t.bynmwcl a,t.bywmwcl b from GK_OPERATION_JSJY_GGFWXX_HX t  where substr(t.rq,1,4) like ?1% and t.szgk like ?2% and sfth='202' and t.RECORD_STATUS<>9) t1", nativeQuery = true)
+	@Query(value = "select sum(t1.a + t1.b), sum(t1.a), sum(t1.b) from (SELECT t.nmjzxttl a, t.wmjzxttl b from GK_OPERATION_JSJY_HXHBGL t  where t.year =?1 and t.szgk = ?2 and t.RECORD_STATUS <> 9) t1", nativeQuery = true)
 	public Object bnljltj(String rq, String szgk);
 
-	@Query(value = "select ((t1.a1-t2.a1)/t2.a1)*100,((t1.a2-t2.a2)/t2.a2)*100,((t1.a3-t2.a3)/t2.a3)*100 from (select (sum(t.bynmwcl) + sum(t.bywmwcl)) a1, sum(t.bynmwcl) a2, sum(t.bywmwcl) a3 from GK_OPERATION_JSJY_GGFWXX_HX t where rq = ?1 and t.szgk like ?3%) t1 , (select (sum(t.bynmwcl) + sum(t.bywmwcl)) a1, sum(t.bynmwcl) a2, sum(t.bywmwcl) a3 from GK_OPERATION_JSJY_GGFWXX_HX t where rq = ?2 and t.szgk like ?3%) t2", nativeQuery = true)
+	@Query(value = "select ((t1.a1 - t2.a1) / t2.a1) * 100, ((t1.a2 - t2.a2) / t2.a2) * 100, ((t1.a3 - t2.a3) / t2.a3) * 100 from (select (sum(t.nmjzxttl) + sum(t.wmjzxttl)) a1, sum(t.nmjzxttl) a2, sum(t.wmjzxttl) a3 from GK_OPERATION_JSJY_HXHBGL t where t.year||'-'||t.month = ?1 and t.szgk = ?3) t1, (select (sum(t.nmjzxttl) + sum(t.wmjzxttl)) a1, sum(t.nmjzxttl) a2, sum(t.wmjzxttl) a3 from GK_OPERATION_JSJY_HXHBGL t where t.year||'-'||t.month = ?2 and t.szgk = ?3) t2", nativeQuery = true)
 	public Object tbzzs(String rq, String lastyear, String szgk);
 
 	@Query(value = "select  count(t1.hxlx) con  from GK_OPERATION_JSJY_CODE c left join (select t.hxlx hxlx from GK_OPERATION_JSJY_GGFWXX_HX t where t.rq like ?1% and t.szgk like ?2% and sfth='202' and t.RECORD_STATUS<>9) t1  on t1.hxlx=c.id  where c.pid='70' group by c.id  order by c.id", nativeQuery = true)
@@ -36,4 +36,7 @@ public interface HxglDao extends SecRepository<HxglEntity, String> {
 	@Modifying
 	@Query(value = "update GK_OPERATION_JSJY_GGFWXX_HX t set t.sfth='201' where t.id =?1", nativeQuery = true)
 	public void tingHang(String id);
+
+	@Query(value = "select t.year||t.month,sum(t.yyhxts),sum(t.yyhxhbs),sum(t.jyhxts),sum(t.jyhxhbs),sum(t.nzxts),sum(t.nzxhbs),sum(t.nmhxts),sum(t.nmhxhbs) from GK_OPERATION_JSJY_HXHBGL t where ((t.year =?1 and t.month=?2) or (t.year=?3 and t.month=?4)) and t.szgk=?5 group by t.year,t.month  order by t.year desc,t.month desc", nativeQuery = true)
+	public List<Object[]> kbxk(String bn, String by, String sn, String sy, String szgk);
 }

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxgl/service/HxglService.java

@@ -18,6 +18,9 @@ public interface HxglService {
 	 */
 	public void logicDelete(String id);
 
+	// 集装箱航线航班开辟情况,bn本年,by本月,xn上个月的年,sy上个月的月
+	public List<Object[]> kbxk(String bn, String by, String sn, String sy, String szgk);
+
 	// 查询本月完成量
 	public Object bywcltj(String rq, String szgk);
 

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxgl/service/impl/HxglServiceImpl.java

@@ -26,6 +26,11 @@ public class HxglServiceImpl extends JyglBaseService<HxglEntity, String> impleme
 	}
 
 	@Override
+	public List<Object[]> kbxk(String bn, String by, String sn, String sy, String szgk) {
+		return dao.kbxk(bn, by, sn, sy, szgk);
+	}
+
+	@Override
 	public List<HxglEntity> findByRq(String rq) {
 		return dao.findByRq(rq);
 	}

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java

@@ -658,10 +658,8 @@ public class JdtxxxCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag,String path,String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		model.addAttribute("path", path);
-		model.addAttribute("type", type);
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 		JdtxxxVo vo = new JdtxxxVo();
 		BeanUtils.copyProperties(entity, vo);

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java

@@ -170,8 +170,8 @@ public class AxCtl extends BaseWebCtl {
 
 		/*page.setSort("axmc");
 		page.setOrder("asc");*/
-		page.setSort("id");
-		page.setOrder("asc");
+		page.setSort("createDateTime");
+		page.setOrder("desc");
 		Page<AxEntity> list = query.findAll(spec, toPageRequest(page), AxEntity.class);
 		List<AxVo> voList = new ArrayList<AxVo>();
 		for (AxEntity entity : list) {
@@ -593,7 +593,7 @@ public class AxCtl extends BaseWebCtl {
 		};
 		page.setPage(pageNum);
 		page.setRows(pageSize);
-		page.setSort("id");
+		page.setSort("axmc");
 		page.setOrder("asc");
 		Page<AxEntity> list = query.findAll(spec, toPageRequest(page), AxEntity.class);
 		List<AxVo> voList = new ArrayList<AxVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -92,7 +92,6 @@ public class JgsqCtl extends BaseWebCtl {
 	private XmbwglbService xmbwglbService;
 	@Autowired
 	private BwService bwService;
-
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jgsq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
@@ -935,13 +934,10 @@ public class JgsqCtl extends BaseWebCtl {
 			model.addAttribute("bwlist", slist);
 		}
 	}
-
+	
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String type, String path) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		JgsqEntity entity = jgsqService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -1005,7 +1001,7 @@ public class JgsqCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1294,7 +1290,7 @@ public class JgsqCtl extends BaseWebCtl {
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
 					String url = "GK_OPERATION_JSJY_JGSQ_ONE_PC?condition=ID=" + entity.getId();
-					boolean tbflag = getTbStatus(url, entity.getSzd().getId());
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jgsqService.save(entity);
@@ -1349,13 +1345,13 @@ public class JgsqCtl extends BaseWebCtl {
 					String s = ssid.substring(0, 2);
 					// 去掉标志位查询
 					AccessoryEntity acc = accessoryService.findOne(ssid.substring(2, ssid.length()));
-					if (acc != null) {
+					if(acc != null){
 						acc.setSsid(xmxxgl.getId());
 						// 把备注设置成标识位+备注
 						acc.setRemark(s + acc.getRemark());
 						accessoryService.save(acc);
 					}
-
+					
 				}
 			}
 		}
@@ -1366,7 +1362,7 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null && filename.getSize() > 0) {
+		if (filename != null && filename.getSize()>0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jgsq");
 			wr.setAttr("acc", acc);
 		} else {
@@ -1398,10 +1394,10 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
 		AccessoryEntity acc = accessoryService.findOne(id);
-		if (acc != null) {
+		if(acc != null ){
 			accessoryService.delete(acc);
 		}
-
+		
 		WebJsonResult wr = success();
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -796,7 +796,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -883,11 +883,8 @@ public class JgsqdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String path, String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		JgsqEntity entity = jgsqdsService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -951,7 +948,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1394,9 +1391,9 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 			jsjd.setId(fjzd.getId());
 		}
-		if (acc != null) {
-			jsjd.setFjmc(acc.getName());
-			jsjd.setFjid(acc.getId());
+		if(acc != null){
+		jsjd.setFjmc(acc.getName());
+		jsjd.setFjid(acc.getId());
 		}
 		return jsjd;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -287,11 +287,11 @@ public class JsjdbgCtl extends BaseWebCtl {
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
-		/*if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
+		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
 			wr.setSuccess(false);
 			wr.setMessage("该项目在流程中，无法删除！");
 			return wr;
-		}*/
+		}
 		try {
 			// 逻辑删除
 			jsjdbgService.logicDelete(id);
@@ -906,11 +906,8 @@ public class JsjdbgCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String path, String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -278,11 +278,11 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
-		/*if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
+		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
 			wr.setSuccess(false);
 			wr.setMessage("该项目在流程中，无法删除！");
 			return wr;
-		}*/
+		}
 		try {
 			// 逻辑删除
 			jsjdbgdsService.logicDelete(id);
@@ -878,11 +878,8 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String path, String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -944,7 +941,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 
 			String opStr = "";
-			int voflag = -1;
+			int voflag = 0;
 			for (int j = 0; j < volist.size(); j++) {
 				TaskInfoVo taskvo = volist.get(j);
 				if (taskvo.getTaskKey().equals(taskentity.getTaskKey())) {
@@ -962,7 +959,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 				opStr += "<div id='" + taskentity.getTaskKey() + "' style = 'float:left;width:100%;text-align: left;'>" + "</div><div style = 'float:left;width:100%;text-align: right;'>" + securityMgr.getCurrUser().getName() + "<br/>" + formatter.format(new Date()) + "</div>";
 				opvo.setYj(opStr);
 			}
-			if (voflag > -1) {
+			if (voflag > 0) {
 				volist.remove(voflag);
 			}
 			volist.add(opvo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -945,11 +945,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag,String path,String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		//返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
+
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -816,7 +816,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -969,11 +969,9 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String path, String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
+
 		JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -1174,39 +1172,36 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		List<TaskInfoVo> volist = new ArrayList<TaskInfoVo>();
 		for (int i = 0; i < slist.size(); i++) {
 			TaskInfoEntity taskentity = slist.get(i);
-			if ("2".equals(taskentity.getState())) {
-				TaskInfoVo opvo = new TaskInfoVo();
-				opvo.setCurrName(taskentity.getCurrName());
-				opvo.setTaskKey(taskentity.getTaskKey());
-				opvo.setState(taskentity.getState());
-				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-
-				String opStr = "";
-				int voflag = -1;
-				for (int j = 0; j < volist.size(); j++) {
-					TaskInfoVo taskvo = volist.get(j);
-					if (taskvo.getTaskKey().equals(taskentity.getTaskKey())) {
-						if ("2".equals(taskvo.getState())) {
-							opStr += taskvo.getYj();
-						}
-						voflag = j;
-						break;
+			TaskInfoVo opvo = new TaskInfoVo();
+			opvo.setCurrName(taskentity.getCurrName());
+			opvo.setTaskKey(taskentity.getTaskKey());
+			opvo.setState(taskentity.getState());
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+			String opStr = "";
+			int voflag = 0;
+			for (int j = 0; j < volist.size(); j++) {
+				TaskInfoVo taskvo = volist.get(j);
+				if (taskvo.getTaskKey().equals(taskentity.getTaskKey())) {
+					if ("2".equals(taskvo.getState())) {
+						opStr += taskvo.getYj();
 					}
+					voflag = j;
+					break;
 				}
-				if ("2".equals(taskentity.getState())) {
-					opStr += "<div  style = 'float:left;width:100%;text-align: left;'>" + taskentity.getAuditMsg() + "</div><div style = 'float:left;width:100%;text-align: right;'>" + taskentity.getAuditUsername() + "<br/>" + formatter.format(taskentity.getAuditTime()) + "</div>";
-					opvo.setYj(opStr);
-				} else {
-					opStr += "<div id='" + taskentity.getTaskKey() + "' style = 'float:left;width:100%;text-align: left;'>" + "</div><div style = 'float:left;width:100%;text-align: right;'>" + securityMgr.getCurrUser().getName() + "<br/>" + formatter.format(new Date()) + "</div>";
-					opvo.setYj(opStr);
-				}
-				if (voflag > -1) {
-					volist.remove(voflag);
-				}
-				volist.add(opvo);
 			}
+			if ("2".equals(taskentity.getState())) {
+				opStr += "<div  style = 'float:left;width:100%;text-align: left;'>" + taskentity.getAuditMsg() + "</div><div style = 'float:left;width:100%;text-align: right;'>" + taskentity.getAuditUsername() + "<br/>" + formatter.format(taskentity.getAuditTime()) + "</div>";
+				opvo.setYj(opStr);
+			} else {
+				opStr += "<div id='" + taskentity.getTaskKey() + "' style = 'float:left;width:100%;text-align: left;'>" + "</div><div style = 'float:left;width:100%;text-align: right;'>" + securityMgr.getCurrUser().getName() + "<br/>" + formatter.format(new Date()) + "</div>";
+				opvo.setYj(opStr);
+			}
+			if (voflag > 0) {
+				volist.remove(voflag);
+			}
+			volist.add(opvo);
 		}
-		
 		model.addAttribute("list", volist);
 
 		model.addAttribute("record", vo);
@@ -1603,7 +1598,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 		String url = "GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
 
-		boolean flag = getTbStatus(url, null);
+		boolean flag = getTbStatus(url,null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -32,13 +32,9 @@ import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
-import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
-import com.xt.jygl.gkjcxx.mt.service.MtService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbVo;
-import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
-import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
@@ -67,10 +63,6 @@ public class DcsbCtl extends BaseWebCtl {
 	@Autowired
 	private DcsbService dcsbService;
 	@Autowired
-	private BwService bwService;
-	@Autowired
-	private MtService mtService;
-	@Autowired
 	private TaskInfoService taskInfoService;
 
 	@RequestMapping(value = "/main")
@@ -454,30 +446,6 @@ public class DcsbCtl extends BaseWebCtl {
 			entity.setShr(user.getName());
 		}
 		model.addAttribute("record", entity);
-		if(!StringUtils.isEmpty(entity.getBw())){
-			BwEntity bw = bwService.findOne(entity.getBw());
-			if(bw != null){
-				vo.setBwmc(bw.getBwmc()!= null ? bw.getBwmc():"");
-			}
-		}
-		if(!StringUtils.isEmpty(entity.getMt())){
-			MtEntity mt = mtService.findOne(entity.getMt());
-			if(mt != null){
-				vo.setMtmc(mt.getMtmc()!= null ? mt.getMtmc():"");
-			}
-		}
-		if(!StringUtils.isEmpty(entity.getJcg())){
-			CodeEntity code = securityMgr.codeService().findOne(entity.getJcg());
-			if(code != null){
-				vo.setJcgmc(code.getText());
-			}
-		}
-		if(!StringUtils.isEmpty(entity.getNwm())){
-			CodeEntity code = securityMgr.codeService().findOne(entity.getJcg());
-			if(code != null){
-				vo.setNwmmc(code.getText());
-			}
-		}
 		model.addAttribute("recordvo", vo);
 		/*
 		 * List<CodeEntity> hwzlList = securityMgr.codeService()

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
 
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.dao.DcsbDao;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
@@ -50,6 +51,7 @@ import com.xt.jygl.workflow.service.impl.BaseWorkFlowServiceImpl;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.SecRepository;
+import com.xtframe.sec.role.entity.RoleEntity;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
@@ -205,84 +207,16 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 		return dao.findDcsb(szdid);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public List<Object> tongjiproValue(String startDate, String endDate, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dedlid) {
-		//return dao.tongjiproValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
-		Map<String, Object> params = new HashMap<String, Object>();
-		StringBuilder sb = new StringBuilder();
-		sb.append("select count(tw.id) sbsl,tg.gqmc, round(sum(tw.zysl / 10000), 4) sum from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GK tg on tw.szgk = tg.id  ");
-		sb.append("where tw.RECORD_STATUS !=9 and  to_char(tw.bgsj, 'yyyy-mm-dd') >= :startDate and to_char(tw.bgsj, 'yyyy-mm-dd') <= :endDate ");
-		params.put("startDate", startDate);
-		params.put("endDate", endDate);
-
-		if (!StringUtils.isEmpty(nwmid)) {
-			sb.append(" and tw.nwm = :nwm");
-			params.put("nwm", nwmid);
-		}
-		if (!StringUtils.isEmpty(szdid)) {
-			sb.append(" and tw.szd = :szd");
-			params.put("szd", szdid);
-		}
-		if (!StringUtils.isEmpty(szgkid)) {
-			sb.append(" and tw.szgk = :szgk");
-			params.put("szgk", szgkid);
-		}
-		if (!StringUtils.isEmpty(szgqid)) {
-			sb.append(" and tw.szgq = :szgq");
-			params.put("szgq", szgqid);
-		}
-		if (!StringUtils.isEmpty(jcgid)) {
-			sb.append(" and tw.jcg = :jcg");
-			params.put("jcg", jcgid);
-		}
-		if (!StringUtils.isEmpty(dedlid)) {
-			sb.append(" and tw.hwzldedl = :hwzldedl");
-			params.put("hwzldedl", dedlid);
-		}
-		sb.append(" group by tg.gkmc ");
-		System.out.println(sb.toString());
-		return (List<Object>) dao.nativeQuery(sb.toString(), params);
+
+		return dao.tongjiproValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public List<Object> tongjicityValue(String startDate, String endDate, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dedlid) {
-		//return dao.tongjicityValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
-		Map<String, Object> params = new HashMap<String, Object>();
-		StringBuilder sb = new StringBuilder();
-		sb.append("select count(tw.id) sbsl,tg.gqmc, round(sum(tw.zysl / 10000), 4) sum from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GQ tg on tw.szgq = tg.id ");
-		sb.append("where tw.RECORD_STATUS !=9 and  to_char(tw.bgsj, 'yyyy-mm-dd') >= :startDate and to_char(tw.bgsj, 'yyyy-mm-dd') <= :endDate ");
-		params.put("startDate", startDate);
-		params.put("endDate", endDate);
-
-		if (!StringUtils.isEmpty(nwmid)) {
-			sb.append(" and tw.nwm = :nwm");
-			params.put("nwm", nwmid);
-		}
-		if (!StringUtils.isEmpty(szdid)) {
-			sb.append(" and tw.szd = :szd");
-			params.put("szd", szdid);
-		}
-		if (!StringUtils.isEmpty(szgkid)) {
-			sb.append(" and tw.szgk = :szgk");
-			params.put("szgk", szgkid);
-		}
-		if (!StringUtils.isEmpty(szgqid)) {
-			sb.append(" and tw.szgq = :szgq");
-			params.put("szgq", szgqid);
-		}
-		if (!StringUtils.isEmpty(jcgid)) {
-			sb.append(" and tw.jcg = :jcg");
-			params.put("jcg", jcgid);
-		}
-		if (!StringUtils.isEmpty(dedlid)) {
-			sb.append(" and tw.hwzldedl = :hwzldedl");
-			params.put("hwzldedl", dedlid);
-		}
-		sb.append(" group by tg.gqmc ");
-		System.out.println(sb.toString());
-		return (List<Object>) dao.nativeQuery(sb.toString(), params);
+
+		return dao.tongjicityValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);
 	}
 
 	@Override

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbybbServiceImpl.java

@@ -37,7 +37,7 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sumZyslBySzgk(String dydlid, String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select A.szgk, round(A.s/10000, 4),nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
+		sb.append("select A.szgk,A.s/10000,nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
 		sb.append(" ( select szgk,nvl(sum(zysl)+sum(zyslteu)*10,0) s  ");
 		sb.append(" from (select szgk,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGK,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
@@ -137,7 +137,7 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sumZyslBySzgq(String dydlid, String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select A.szgq, round(A.s/10000, 4),nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
+		sb.append("select A.szgq,A.s/10000,nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
 		sb.append(" ( select szgq,nvl(sum(zysl)+sum(zyslteu)*10,0) s  ");
 		sb.append(" from (select szgq,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGq,nvl(t.ZYSL,0) v1,nvl(t.ZYSLxg,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
@@ -236,10 +236,10 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sum(String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dydlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select aa.s,  round((nvl(aa.jg,0)+nvl(bb.cg,0))/10000, 4),nvl(round((aa.jg+aa.cg)/decode((bb.jg + bb.cg),0,1), 2)*100,0),");
+		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/decode((bb.jg + bb.cg),0,1), 2)*100,0),");
 		sb.append("nvl(round((aa.jg+aa.cg)/decode((cc.jg + cc.cg),0,1), 2)*100,0),");
-		sb.append("round(nvl(aa.jg,0)/10000,4),nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
-		sb.append("round(nvl(aa.cg,0)/10000,4),nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
+		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
+		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
 		sb.append(" from ");
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzl) hwzl ");
 		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then  nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
@@ -333,10 +333,10 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sum2(String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select aa.s, round((nvl(aa.jg,0)+nvl(bb.cg,0))/10000,4),nvl(round((aa.jg+aa.cg)/ decode((bb.jg + bb.cg),0,1), 2)*100,0),");
+		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/ decode((bb.jg + bb.cg),0,1), 2)*100,0),");
 		sb.append("nvl(round((aa.jg+aa.cg)/decode((cc.jg + cc.cg),0,1), 2)*100,0),");
-		sb.append("round(nvl(aa.jg,0)/10000,4),nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
-		sb.append("round(nvl(aa.cg,0)/10000,4),nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
+		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
+		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
 		sb.append(" from ");
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzldedl) hwzldedl ");
 		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then  nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/vo/DcsbVo.java

@@ -18,17 +18,13 @@ public class DcsbVo extends BaseVo {
 	private String zypmc = null;
 	private Double zysl;
 	private String jcg = null;
-	private String jcgmc = null;
 	private Date bgsj = null;
 	private String xg = null;
 	private String sg = null;
 	private String zyfs = null;
 	private String nwm = null;
-	private String nwmmc = null;
 	private String mt = null;
-	private String mtmc = null;
 	private String bw = null;
-	private String bwmc = null;
 	private String mtlb = null;
 	private Integer jzxsl;
 	private String hwzl = null;
@@ -57,45 +53,12 @@ public class DcsbVo extends BaseVo {
 	private String gk40 = null;
 	private Integer gksl40 = null;
 	private String taskState;
-	private String sfg = null;
-	private String mdg = null;
+	private String sfg=null;
+	private String mdg=null;
 	private String flag;
-	// 货物种类第二大类
+	//货物种类第二大类
 	private String hwzldedl = null;
 	private String hwzldedlzw = null;
-
-	public String getJcgmc() {
-		return jcgmc;
-	}
-
-	public void setJcgmc(String jcgmc) {
-		this.jcgmc = jcgmc;
-	}
-
-	public String getNwmmc() {
-		return nwmmc;
-	}
-
-	public void setNwmmc(String nwmmc) {
-		this.nwmmc = nwmmc;
-	}
-
-	public String getMtmc() {
-		return mtmc;
-	}
-
-	public void setMtmc(String mtmc) {
-		this.mtmc = mtmc;
-	}
-
-	public String getBwmc() {
-		return bwmc;
-	}
-
-	public void setBwmc(String bwmc) {
-		this.bwmc = bwmc;
-	}
-
 	public String getSfg() {
 		return sfg;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/webservice/DcsbWebService.java

@@ -106,13 +106,13 @@ public class DcsbWebService extends BaseWebCtl {
 		if (user.getSsjyr() != null) {
 			addNotEmptyModel(filterList, "ssjyr.id", user.getSsjyr().getId(), Operator.EQ);
 		} else {
-			addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
+			/*addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
 			List<String> gqList = gqService.findGqListByUserId(user.getId());
 			if (gqList != null) {
 				for (String id : gqList) {
 					addNotEmptyModel(filterList, "szgq.id", id, Operator.EQ, JoinType.OR);
 				}
-			}
+			}*/
 		}
 		// 只检索非删除状态记录
 		addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -21,6 +21,9 @@ import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import oracle.net.aso.f;
+
+import org.apache.commons.lang.ObjectUtils.Null;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -48,9 +51,11 @@ import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.ctl.MtCtl;
 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
 import com.xt.jygl.gkjcxx.mt.service.MtService;
 import com.xt.jygl.gkjcxx.mt.vo.MtVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.ctl.BwCtl;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.ctl.CgCtl;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
@@ -78,15 +83,18 @@ import com.xt.jygl.gkjygl.gkjyr.qytz.ctl.QytzCtl;
 import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
 import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
 import com.xt.jygl.gkjygl.gkjyr.qytz.vo.QytzVo;
+import com.xt.jygl.gkjygl.gkjyr.ry.ctl.RyCtl;
 import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
 import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
 import com.xt.jygl.gkjygl.gkjyr.sssb.ctl.SssbCtl;
 import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
 import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
 import com.xt.jygl.gkjygl.gkjyr.sssb.vo.SssbVo;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.ctl.XkzfzCtl;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.entity.XkzfzEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.vo.XkzfzVo;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.ctl.XkzxxCtl;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
@@ -782,7 +790,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setQyxzzw(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getText() : "");
-		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(id);
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
@@ -1056,7 +1064,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getId() : "");
 		gkjyrVo.setYwcqzm(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getId() : "");
 		gkjyrVo.setYwjgys(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getId() : "");
-		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");
@@ -1137,7 +1145,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 
@@ -1289,7 +1297,6 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		// 岸线
@@ -1400,7 +1407,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
@@ -1655,9 +1662,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setMtsfwars(entity.getMtsfwars() != null ? entity.getMtsfwars().getId() : "");
 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
 				vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
-				if(StringUtils.isNotEmpty(entity.getMtyt())){
-					vo.setMtytzw(securityMgr.codeService().findOne(entity.getMtyt()).getText());
-				}
+				vo.setMtytzw(entity.getMtyt() != null ? entity.getMtyt() : "");
 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());
 				if (xkzglb != null) {
 					vo.setIsTrue(true);
@@ -1715,9 +1720,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
-				if(StringUtils.isNotEmpty(entity.getBwyt())){
-					vo.setBwytzw(securityMgr.codeService().findOne(entity.getBwyt()).getText());
-				}
+				vo.setBwytzw(entity.getBwyt() != null ? entity.getBwyt() : "");
 				vo.setWxpbwzw(entity.getWxpbw() != null ? entity.getWxpbw().getText() : "");
 				vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());
@@ -2235,24 +2238,12 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(id);
-		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
-				gkjyrVo.setXkzyxq(xkz.getYxqz());
-				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
-				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
-				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
-				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
-				gkjyrVo.setJyfw(xkz.getZyqyfw());
-				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
-			}
-		}
+
 		gkjyrVo.setSfwhqy(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		return "gkjygl/gkjyr/jyrjbxx/print";
@@ -2666,19 +2657,7 @@ public class GkjyrCtl extends BaseWebCtl {
 						gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 					}
 				}
-				List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());
-				for (XkzxxEntity xkz : xkzs) {
-					if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
-						gkjyrVo.setXkzyxq(xkz.getYxqz());
-						gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
-						gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
-						gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
-						gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
-						gkjyrVo.setJyfw(xkz.getZyqyfw());
-						gkjyrVo.setJyqy(xkz.getCq());
-						gkjyrVo.setFzjg(xkz.getFzjg());
-					}
-				}
+
 				gkjyrVo.setSfwhqy(null != entity.getSfwhqy() ? entity.getSfwhqy().getText() : "");
 				gkjyrVo.setSfzdsp(null != entity.getSfzdsp() ? entity.getSfzdsp().getText() : "");
 				gkjyrVo.setYwcqzmzw(null != entity.getYwcqzm() ? entity.getYwcqzm().getText() : "");
@@ -2686,7 +2665,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setMtjgxs(null != entity.getMtjgxs() ? entity.getMtjgxs().getId() : "");
 				gkjyrVo.setMtjgxszw(null != entity.getMtjgxs() ? entity.getMtjgxs().getText() : "");
 				gkjyrVo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");
-				// gkjyrVo.setFzrqstr(transFormatDate(entity.getFzrq()));
+				gkjyrVo.setFzrqstr(transFormatDate(entity.getFzrq()));
 
 				voList.add(gkjyrVo);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/dao/XkzxxDao.java

@@ -17,7 +17,7 @@ public interface XkzxxDao extends SecRepository<XkzxxEntity, String> {
 	@Query("SELECT m from XkzxxEntity m where m.gkjyr =?1 and m.sfyx = ?2 and m.recordStatus<>9")
 	List<XkzxxEntity> findByJyrid(String jyrid, String status);
 	
-	@Query("SELECT m from XkzxxEntity m where m.opid =?1 and m.sfyx = ?2 and m.recordStatus = 1")
+	@Query("SELECT m from XkzxxEntity m where m.opid =?1 and m.sfyx = ?2 and m.recordStatus<>9")
 	XkzxxEntity findByOpid(String opid, String status);
 	
 	@Query("SELECT m from XkzxxEntity m where m.gkjyr =?1 and m.recordStatus<>9")

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -413,7 +413,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -423,14 +423,13 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 
 		// 经营范围 业务种类
@@ -707,7 +706,6 @@ public class XkzbgCtl extends BaseWebCtl {
 					BeanUtils.copyProperties(xkz, nxkz);
 					nxkz.setId(null);
 					nxkz.setGkjyr(ngkjyr.getId());
-					nxkz.setOpid(null);
 					nxkz.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
 					xkzxxService.save(nxkz);
 				}
@@ -1121,7 +1119,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1131,14 +1129,13 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain";
 	}
@@ -1380,7 +1377,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1390,14 +1387,13 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain";
 	}
@@ -1643,11 +1639,7 @@ public class XkzbgCtl extends BaseWebCtl {
 			List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
 			if (list != null && list.size() > 0) {
 				for (XkzsqglbEntity entity : list) {
-					if(entity != null){
-						if(StringUtils.isEmpty(entity.getCreateUser()) || "1".equals(entity.getCreateUser())){
-							newlist.add(Integer.parseInt(entity.getFileid()));
-						}
-					}
+					newlist.add(Integer.parseInt(entity.getFileid()));
 				}
 			}
 		}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -329,7 +329,7 @@ public class XkzsqCtl extends BaseWebCtl {
 							}
 						}
 					}
-					if (!isJyr()) {
+					if(!isJyr()){
 						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "11");
 						if (xkz != null) {
 							vo.setOpflag("1");
@@ -413,7 +413,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (user.getSsjyr() != null) {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
-
+			
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("sqr", user.getName());
@@ -2349,11 +2349,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
 			if (list != null && list.size() > 0) {
 				for (XkzsqglbEntity entity : list) {
-					if (entity != null) {
-						if (StringUtils.isEmpty(entity.getCreateUser())) {
-							newlist.add(Integer.parseInt(entity.getFileid()));
-						}
-					}
+					newlist.add(Integer.parseInt(entity.getFileid()));
 				}
 			}
 		}
@@ -2662,7 +2658,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				code = securityMgr.codeService().findOne(code.getPid());
 			}
 			szd = szd + "港经证";
-
+			
 			xkz.setGkjyxkzh("");
 			xkz.setFzrq(new Date());
 			xkz.setYxqq(new Date());
@@ -2679,51 +2675,83 @@ public class XkzsqCtl extends BaseWebCtl {
 			xkz = xkzxxService.save(xkz);
 
 			// 经营人许可证更新
-			/*
-			 * jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * jyr.setFddbr(xkzsq.getFddbr()); jyr.setLxdh(xkzsq.getLxdh());
-			 * jyr.setCz(xkzsq.getCz()); jyr.setGkjyxkzh(xkzbh);
-			 * jyr.setJyfw(jyfwstr2); jyr.setJyqy(jylzstr);
-			 * jyr.setFzrq(dateTimeFormat.parse(date));
-			 * jyr.setFzrq(xkz.getFzrq()); jyr.setFzjg(xkz.getFzjg());
-			 * gkjyrService.save(jyr);
-			 */
+			/*jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			jyr.setFddbr(xkzsq.getFddbr());
+			jyr.setLxdh(xkzsq.getLxdh());
+			jyr.setCz(xkzsq.getCz());
+			jyr.setGkjyxkzh(xkzbh);
+			jyr.setJyfw(jyfwstr2);
+			jyr.setJyqy(jylzstr);
+			jyr.setFzrq(dateTimeFormat.parse(date));
+			jyr.setFzrq(xkz.getFzrq());
+			jyr.setFzjg(xkz.getFzjg());
+			gkjyrService.save(jyr);*/
 
 			// xkzglb表操作
 			// 码头泊位储罐仓库堆场人员设备信息企业投资
-			/*
-			 * List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
-			 * if (xkzglblist != null && xkzglblist.size() > 0) { for
-			 * (XkzglbEntity xkzglb : xkzglblist) {
-			 * xkzglb.setXkzid(xkz.getId()); xkzglb.setXkzbh(xkz.getGkjyxkzh());
-			 * xkzglbService.save(xkzglb); if (xkzglb.getType().equals("1")) {
-			 * MtEntity mt = mtService.findOne(xkzglb.getYwid()); if (mt !=
-			 * null) { mt.setXkzid(xkz.getId()); mtService.save(mt); } } else if
-			 * (xkzglb.getType().equals("2")) { BwEntity bw =
-			 * bwService.findOne(xkzglb.getYwid()); if (bw != null) {
-			 * bw.setXkzid(xkz.getId()); bwService.save(bw); } } else if
-			 * (xkzglb.getType().equals("3")) { CgEntity cg =
-			 * cgService.findOne(xkzglb.getYwid()); if (cg != null) {
-			 * cg.setXkzid(xkz.getId()); cgService.save(cg); } } else if
-			 * (xkzglb.getType().equals("4")) { CkEntity ck =
-			 * ckService.findOne(xkzglb.getYwid()); if (ck != null) {
-			 * ck.setXkzid(xkz.getId()); ckService.save(ck); } } else if
-			 * (xkzglb.getType().equals("5")) { DcEntity dc =
-			 * dcService.findOne(xkzglb.getYwid()); if (dc != null) {
-			 * dc.setXkzid(xkz.getId()); dcService.save(dc); } } else if
-			 * (xkzglb.getType().equals("6")) { RyEntity ry =
-			 * ryService.findOne(xkzglb.getYwid()); if (ry != null) {
-			 * ry.setXkzid(xkz.getId()); ryService.save(ry); } } else if
-			 * (xkzglb.getType().equals("7")) { SssbEntity sssb =
-			 * sssbService.findOne(xkzglb.getId()); if (sssb != null) {
-			 * sssb.setXkzid(xkz.getId()); sssbService.save(sssb); } } else if
-			 * (xkzglb.getType().equals("8")) { QytzEntity qytz =
-			 * qytzService.findOne(xkzglb.getId()); if (qytz != null) {
-			 * qytz.setXkzid(xkz.getId()); qytzService.save(qytz); } } else if
-			 * (xkzglb.getType().equals("9")) { ZxjxEntity zxjx =
-			 * zxjxService.findOne(xkzglb.getId()); if (zxjx != null) {
-			 * zxjx.setXkzid(xkz.getId()); zxjxService.save(zxjx); } } } }
-			 */
+			/*List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
+			if (xkzglblist != null && xkzglblist.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglblist) {
+					xkzglb.setXkzid(xkz.getId());
+					xkzglb.setXkzbh(xkz.getGkjyxkzh());
+					xkzglbService.save(xkzglb);
+					if (xkzglb.getType().equals("1")) {
+						MtEntity mt = mtService.findOne(xkzglb.getYwid());
+						if (mt != null) {
+							mt.setXkzid(xkz.getId());
+							mtService.save(mt);
+						}
+					} else if (xkzglb.getType().equals("2")) {
+						BwEntity bw = bwService.findOne(xkzglb.getYwid());
+						if (bw != null) {
+							bw.setXkzid(xkz.getId());
+							bwService.save(bw);
+						}
+					} else if (xkzglb.getType().equals("3")) {
+						CgEntity cg = cgService.findOne(xkzglb.getYwid());
+						if (cg != null) {
+							cg.setXkzid(xkz.getId());
+							cgService.save(cg);
+						}
+					} else if (xkzglb.getType().equals("4")) {
+						CkEntity ck = ckService.findOne(xkzglb.getYwid());
+						if (ck != null) {
+							ck.setXkzid(xkz.getId());
+							ckService.save(ck);
+						}
+					} else if (xkzglb.getType().equals("5")) {
+						DcEntity dc = dcService.findOne(xkzglb.getYwid());
+						if (dc != null) {
+							dc.setXkzid(xkz.getId());
+							dcService.save(dc);
+						}
+					} else if (xkzglb.getType().equals("6")) {
+						RyEntity ry = ryService.findOne(xkzglb.getYwid());
+						if (ry != null) {
+							ry.setXkzid(xkz.getId());
+							ryService.save(ry);
+						}
+					} else if (xkzglb.getType().equals("7")) {
+						SssbEntity sssb = sssbService.findOne(xkzglb.getId());
+						if (sssb != null) {
+							sssb.setXkzid(xkz.getId());
+							sssbService.save(sssb);
+						}
+					} else if (xkzglb.getType().equals("8")) {
+						QytzEntity qytz = qytzService.findOne(xkzglb.getId());
+						if (qytz != null) {
+							qytz.setXkzid(xkz.getId());
+							qytzService.save(qytz);
+						}
+					} else if (xkzglb.getType().equals("9")) {
+						ZxjxEntity zxjx = zxjxService.findOne(xkzglb.getId());
+						if (zxjx != null) {
+							zxjx.setXkzid(xkz.getId());
+							zxjxService.save(zxjx);
+						}
+					}
+				}
+			}*/
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -2849,4 +2877,5 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -374,14 +374,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(gkjyr.getId());
@@ -542,7 +541,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			List<XkzyxfjEntity> list = xkzyxfjService.findBySqid(yx.getId());
 			if (list != null && list.size() > 0) {
 				for (XkzyxfjEntity fj : list) {
-					if (fj != null && fj.getFjid() != null) {
+					if (fj != null) {
 						XkzyxfjEntity xkzyxfj = new XkzyxfjEntity();
 						AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
 						if (!StringUtils.isEmpty(acc)) {
@@ -842,14 +841,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain";
 	}
@@ -1109,14 +1107,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain";
 	}
@@ -1220,9 +1217,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
 			if (list != null && list.size() > 0) {
 				for (XkzsqglbEntity entity : list) {
-					if(StringUtils.isEmpty(entity.getCreateUser()) || "2".equals(entity.getCreateUser())){
-						newlist.add(Integer.parseInt(entity.getFileid()));
-					}
+					newlist.add(Integer.parseInt(entity.getFileid()));
 				}
 			}
 		}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -413,7 +413,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -423,14 +423,13 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(gkjyr.getId());
 		List<String> jyfwids = new ArrayList<String>();
@@ -737,7 +736,6 @@ public class XkzzxCtl extends BaseWebCtl {
 					BeanUtils.copyProperties(xkz, nxkz);
 					nxkz.setId(null);
 					nxkz.setGkjyr(ngkjyr.getId());
-					nxkz.setOpid(null);
 					nxkz.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
 					xkzxxService.save(nxkz);
 				}
@@ -1092,7 +1090,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1102,14 +1100,13 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		return "gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain";
@@ -1296,7 +1293,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1306,14 +1303,13 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
-				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
-		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		model.addAttribute("xkzzx", xkzzxentity);
 		return "gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain";

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -90,7 +90,6 @@ public class LhbgCtl extends BaseWebCtl {
 	private XkzxxService xkzxxService;
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
-
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -219,11 +218,8 @@ public class LhbgCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String path, String type) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		LhbgEntity lhbg = lhbgService.findOne(id);
 
 		List<LhbgfjEntity> list = lhbgfjService.findByBgid(lhbg.getId());
@@ -231,7 +227,7 @@ public class LhbgCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhbgfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -667,7 +663,7 @@ public class LhbgCtl extends BaseWebCtl {
 				// entity.setSftb(Constants.YES);
 				entity = lhbgService.save(entity);
 				if (flag && StringUtils.isEmpty(entity.getTyyy())) {
-					if (StringUtils.isEmpty(entity.getTyyy())) {
+					if(StringUtils.isEmpty(entity.getTyyy())){
 						UserEntity user = securityMgr.getCurrUser();
 						GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
 						XkzxxEntity xkz = new XkzxxEntity();
@@ -691,7 +687,7 @@ public class LhbgCtl extends BaseWebCtl {
 							xkz.setSzgk(jyr.getSzgk().getId());
 							xkz.setSzd(jyr.getSzd());
 						}
-
+						
 						xkz.setLxdh(entity.getLxr());
 						xkz.setZyqyfw(jyr.getJyfw());
 						xkz.setCq(jyr.getJyqy());
@@ -721,18 +717,18 @@ public class LhbgCtl extends BaseWebCtl {
 				if (!flag || !StringUtils.isEmpty(entity.getTyyy())) {
 					entity.setSftb(Constants.YES);
 					entity = lhbgService.save(entity);
-
+					
 					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());
 					if (list != null && list.size() > 0) {
 						for (XkzxxEntity xkzxxentity : list) {
-							if ("1".equals(xkzxxentity.getSfyx())) {
+							if("1".equals(xkzxxentity.getSfyx())){
 								xkzxxentity.setSfyx(Constants.XKZ_WX);
 								xkzxxentity.setIsflag("0");
 								xkzxxService.save(xkzxxentity);
 							}
 						}
 					}
-
+					
 					// 如果是省级审核通过或不通过后同步到市级
 					try {
 						List<LhbgfjEntity> fjlist = lhbgfjService.findByBgid(id);
@@ -743,7 +739,7 @@ public class LhbgCtl extends BaseWebCtl {
 							}
 							fjid = fjid.substring(0, fjid.length() - 1);
 						}
-						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=" + entity.getJyrid();
+						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid+";JYRID="+entity.getJyrid();
 						boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 						if (tbflag) {
 							entity.setTbzt("Y");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -258,11 +258,8 @@ public class LhsqCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String type, String path) {
+	public String view(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		LhsqEntity lhsq = lhsqService.findOne(id);
 		model.addAttribute("record", lhsq);
 
@@ -271,7 +268,7 @@ public class LhsqCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhsqfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -760,7 +757,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 					// 许可证信息
 					GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
-					if (jyr != null) {
+					if(jyr != null){
 						XkzxxEntity xkz = new XkzxxEntity();
 						xkz.setGkjyr(jyr.getId());
 						// xkz.setZyqyfw(jyfwstr2);
@@ -789,7 +786,7 @@ public class LhsqCtl extends BaseWebCtl {
 							code = securityMgr.codeService().findOne(code.getPid());
 						}
 						szd = szd + "港经证";
-
+						
 						xkz.setGkjyxkzh("");
 						xkz.setFzrq(new Date());
 						xkz.setYxqq(new Date());
@@ -805,9 +802,9 @@ public class LhsqCtl extends BaseWebCtl {
 						xkz.setOpid(entity.getId());
 						xkz = xkzxxService.save(xkz);
 					}
-
+					
 				}
-				// 退回地市，同步
+				//退回地市，同步
 				if (!flag) {
 					entity.setSftb(Constants.YES);
 					entity = lhsqService.save(entity);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -226,11 +226,8 @@ public class LhyxCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag, String type, String path) {
+	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
-		// 返回标志
-		model.addAttribute("type", type);
-		model.addAttribute("path", path);
 		LhyxEntity lhyx = lhyxService.findOne(id);
 		model.addAttribute("record", lhyx);
 		List<LhyxfjEntity> list = lhyxfjService.findByYxid(lhyx.getId());
@@ -238,7 +235,7 @@ public class LhyxCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhyxfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -653,11 +650,11 @@ public class LhyxCtl extends BaseWebCtl {
 				}
 				// entity.setSftb(Constants.YES);
 				entity = lhyxService.save(entity);
-				if (flag) {
+				if(flag){
 					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());
-					if (list != null && list.size() > 0) {
-						for (XkzxxEntity xkz : list) {
-							if ("1".equals(xkz.getSfyx())) {
+					if(list != null && list.size()>0){
+						for(XkzxxEntity xkz:list){
+							if("1".equals(xkz.getSfyx())){
 								xkz.setIsflag("0");
 								xkz = xkzxxService.save(xkz);
 								XkzxxEntity xkzxx = new XkzxxEntity();
@@ -679,7 +676,7 @@ public class LhyxCtl extends BaseWebCtl {
 								xkzxx.setZyhwpm(xkz.getZyhwpm());
 								xkzxx.setZyqyfw(xkz.getZyqyfw());
 								xkzxx.setSzgk(xkz.getSzgk());
-								// xkzxx.setZmpicid(xkz.getZmpicid());
+								//xkzxx.setZmpicid(xkz.getZmpicid());
 								if (xkz.getYxqz() != null) {
 									SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 									String date = dateTimeFormat.format(xkz.getYxqz());
@@ -695,7 +692,7 @@ public class LhyxCtl extends BaseWebCtl {
 						}
 					}
 				}
-
+				
 				if (!flag) {
 					entity.setSftb(Constants.YES);
 					entity = lhyxService.save(entity);

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkttlfx/ctl/HwttlfzCtl.java

@@ -210,10 +210,6 @@ public class HwttlfzCtl extends BaseWebCtl {
 				vo.setCgttl(e[7].toString());
 				vo.setCgtb(e[8].toString());
 				vo.setCghb(e[9].toString());
-				BigDecimal a = (BigDecimal) e[4];
-				BigDecimal d = (BigDecimal) e[7];
-				a = a.add(d);
-				vo.setZttl(a.toString());
 				slist.add(vo);
 			}
 			BigDecimal zttl = new BigDecimal("0.0000");
@@ -229,10 +225,9 @@ public class HwttlfzCtl extends BaseWebCtl {
 				Object[] e = (Object[]) ttllist.get(i);
 				SttlVo vo = new SttlVo();
 				vo.setHwzlname(e[0].toString());
-				//vo.setZttl(e[1].toString());
+				vo.setZttl(e[1].toString());
 				BigDecimal b = (BigDecimal) e[1];
-				
-				//zttl = zttl.add(b);
+				zttl = zttl.add(b);
 				vo.setZtb(e[2].toString());
 				b = (BigDecimal) e[2];
 				ztb = ztb.add(b);
@@ -257,13 +252,7 @@ public class HwttlfzCtl extends BaseWebCtl {
 				vo.setCghb(e[9].toString());
 				b = (BigDecimal) e[9];
 				cghb = cghb.add(b);
-				
-				BigDecimal a = (BigDecimal) e[4];
-				BigDecimal d = (BigDecimal) e[7];
-				b = a.add(d);
-				vo.setZttl(b.toString());
-				zttl = zttl.add(b);
-				//slist.add(vo);
+				slist.add(vo);
 			}
 			sum.setZttl(zttl.toString());
 			sum.setZhb(zhb.toString());

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java

@@ -1,7 +1,7 @@
 package com.xt.jygl.gkyxtjyfx.hxhbtj.ctl;
 
-
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -18,6 +18,7 @@ import com.xt.jygl.gkyxtjyfx.hxhbtj.vo.HxhbtjVo;
 import com.xtframe.core.base.ctl.BaseCtl;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.util.StringUtils;
+
 @Controller
 @RequestMapping("/hxhbtj")
 public class HxhbtjCtl extends BaseCtl {
@@ -27,148 +28,175 @@ public class HxhbtjCtl extends BaseCtl {
 	private SecurityMgr securityMgr;
 	@Autowired
 	private GkService gkService;
+
 	@SuppressWarnings("unused")
 	@RequestMapping(value = "/main")
-	public String main(Model model, final String rq, final String szgkid,final String menuid) {
-		//取到所在地下第一个所在港口
-		List<GkEntity> list = gkService.findBySzd(securityMgr.getCurrUser().getSzd()!=null?securityMgr.getCurrUser().getSzd().getId():"");
-		String dftszgk="";
-		if(list.size()>0){
-			dftszgk=list.get(0).getId();
+	public String main(Model model, final String rq, final String szgkid, final String menuid) {
+		// 取到所在地下第一个所在港口
+		List<GkEntity> list = gkService.findBySzd(securityMgr.getCurrUser().getSzd() != null ? securityMgr.getCurrUser().getSzd().getId() : "");
+		String dftszgk = "";
+		if (list.size() > 0) {
+			dftszgk = list.get(0).getId();
 		}
-		Date date=new Date();
-		//本月数据
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM");
+		Date date = new Date();
+		// 本月数据
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		String benyue = sdf.format(date);
-		Object[] ob=(Object[]) hxglService.bywcltj(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		HxhbtjVo vo=new HxhbtjVo();
-		vo.setBywcl(ob[0]!=null?(ob[0].toString()):"");
-		vo.setBynmwcl(ob[1]!=null?(ob[1].toString()):"");
-		vo.setBywmwcl(ob[2]!=null?(ob[2].toString()):"");
-		//本年数据
-		SimpleDateFormat sdf2=new SimpleDateFormat("yyyy");
-		String bennian=sdf2.format(date);
-		String rq2="";
-		if(!StringUtils.isEmpty(rq)){
-			rq2=rq.substring(0,4);
+		Object[] ob = (Object[]) hxglService.bywcltj(StringUtils.isEmpty(rq) ? benyue : rq, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		HxhbtjVo vo = new HxhbtjVo();
+		vo.setBywcl(ob[0] != null ? (ob[0].toString()) : "");
+		vo.setBynmwcl(ob[1] != null ? (ob[1].toString()) : "");
+		vo.setBywmwcl(ob[2] != null ? (ob[2].toString()) : "");
+		// 本年数据
+		SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy");
+		String bennian = sdf2.format(date);
+		String rq2 = "";
+		if (!StringUtils.isEmpty(rq)) {
+			rq2 = rq.substring(0, 4);
 		}
-		Object[] ob2=(Object[]) hxglService.bnljltj(StringUtils.isEmpty(rq2)?bennian:rq2, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		vo.setBnljl(ob2[0]!=null?(ob2[0].toString()):"");
-		vo.setBnnmljl(ob2[1]!=null?(ob2[1].toString()):"");
-		vo.setBnwmljl(ob2[2]!=null?(ob2[2].toString()):"");
-		//同比增长数
-		String lastyear="";
-		if(StringUtils.isEmpty(rq)){
-			Integer i = Integer.parseInt(benyue.substring(0, 4))-1;
-			lastyear=i+benyue.substring(4, 7);	
-		}else{
-			Integer i = Integer.parseInt(rq.substring(0, 4))-1;
-			lastyear=i+rq.substring(4, 7);	
+		Object[] ob2 = (Object[]) hxglService.bnljltj(StringUtils.isEmpty(rq2) ? bennian : rq2, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		vo.setBnljl(ob2[0] != null ? (ob2[0].toString()) : "");
+		vo.setBnnmljl(ob2[1] != null ? (ob2[1].toString()) : "");
+		vo.setBnwmljl(ob2[2] != null ? (ob2[2].toString()) : "");
+		// 同比增长数
+		String lastyear = "";
+		if (StringUtils.isEmpty(rq)) {
+			Integer i = Integer.parseInt(benyue.substring(0, 4)) - 1;
+			lastyear = i + benyue.substring(4, 7);
+		} else {
+			Integer i = Integer.parseInt(rq.substring(0, 4)) - 1;
+			lastyear = i + rq.substring(4, 7);
 		}
-		Object[] ob3=(Object[]) hxglService.tbzzs(StringUtils.isEmpty(rq)?benyue:rq,lastyear, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		vo.setTbzzs(ob3[0]!=null?(String.format("%.2f", ob3[0])+"%"):"- -");
-		vo.setNmtbzzs(ob3[1]!=null?(String.format("%.2f", ob3[1])+"%"):"- -");
-		vo.setWmtbzzs(ob3[2]!=null?(String.format("%.2f", ob3[2])+"%"):"- -");
-		//航线航班本月营运航线
-		List<Object> list1=hxglService.hxhbyytj(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		vo.setByyyhxzs1(list1.get(0).toString());
-		vo.setByyyhxzs2(list1.get(1).toString());
-		vo.setByyyhxzs3(list1.get(2).toString());
-		vo.setByyyhxzs4(list1.get(3).toString());
-		//本月航班数量按照航线类型分组
-		List<Object> list2=hxglService.hbyytj(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		vo.setByyyhbzs1(list2.get(0).toString());
-		vo.setByyyhbzs2(list2.get(1).toString());
-		vo.setByyyhbzs3(list2.get(2).toString());
-		vo.setByyyhbzs4(list2.get(3).toString());
-		//本月停航航班数量按照航线类型分组
-		List<Object> list3=hxglService.bytyhxs(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		vo.setBytkhxs1(list3.get(0).toString());
-		vo.setBytkhxs2(list3.get(1).toString());
-		vo.setBytkhxs3(list3.get(2).toString());
-		vo.setBytkhxs4(list3.get(3).toString());
-		//按照日期统计所有本月航线(名称)
-		List<HxglEntity> hxgl=hxglService.findByRqAndSzgk(StringUtils.isEmpty(rq)?benyue:rq,StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		String lastmonth="";
-		if(StringUtils.isEmpty(rq)){
-			Integer i = Integer.parseInt(benyue.substring(5, 7))-1;
-			if(i<10){
-			lastmonth=benyue.substring(0, 5)+"0"+i;
-			}else{
-			lastmonth=benyue.substring(0, 5)+i;		
-			}
-		}else{
-			Integer i = Integer.parseInt(rq.substring(5, 7))-1;
-			if(i<10){
-			lastmonth=rq.substring(0, 5)+"0"+i;
-			}else{
-			lastmonth=rq.substring(0, 5)+i;		
-			}
+		Object[] ob3 = (Object[]) hxglService.tbzzs(StringUtils.isEmpty(rq) ? benyue : rq, lastyear, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		vo.setTbzzs(ob3[0] != null ? (String.format("%.2f", ob3[0]) + "%") : "- -");
+		vo.setNmtbzzs(ob3[1] != null ? (String.format("%.2f", ob3[1]) + "%") : "- -");
+		vo.setWmtbzzs(ob3[2] != null ? (String.format("%.2f", ob3[2]) + "%") : "- -");
+		// 集装箱航线航班开辟情况
+		Calendar cal = Calendar.getInstance();
+		if (StringUtils.isNotEmpty(rq)) {
+			String year = rq.substring(0, 4);
+			String month = rq.substring(5, 7);
+			cal.set(Calendar.YEAR, Integer.parseInt(year));
+			cal.set(Calendar.MONTH, Integer.parseInt(month));
 		}
-		//按照日期统计所有上个月月航线(名称)
-		List<HxglEntity> lasthxgl=hxglService.findByRqAndSzgk(lastmonth,StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		//count表示本月航线名称与上月航线名称相同的航线总数
-		int count1 = 0;
-		int count2 = 0;
-		int count3 = 0;
-		int count4 = 0;
-		for(int i=0;i<hxgl.size();i++){
-			for(int j=0;j<lasthxgl.size();j++){
-				if(hxgl.get(i).getHxlx().getId().equals("7001")){
-					if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())&&lasthxgl.get(j).getHxlx().getId().equals("7001")){
-						count1=count1+1;
-						break;
-					}
-				}else if(hxgl.get(i).getHxlx().getId().equals("7002")&&lasthxgl.get(j).getHxlx().getId().equals("7002")){
-					if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
-						count2=count2+1;
-						break;
-					}
-				}else if(hxgl.get(i).getHxlx().getId().equals("7003")&&lasthxgl.get(j).getHxlx().getId().equals("7003")){
-					if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
-						count3=count3+1;
-						break;
-					}
-				}else if(hxgl.get(i).getHxlx().getId().equals("7004")&&lasthxgl.get(j).getHxlx().getId().equals("7004")){
-					if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
-						count4=count4+1;
-						break;
-					}
+		String bn = cal.get(Calendar.YEAR) + "";
+		String by = (cal.get(Calendar.MONTH) + 1) + "";
+		cal.add(Calendar.MONTH, -1);
+		String sn = cal.get(Calendar.YEAR) + "";
+		String sy = (cal.get(Calendar.MONTH) + 1) + "";
+		List<Object[]> list1 = hxglService.kbxk(bn, by, sn, sy, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		if (list1 != null && list1.size() > 0) {
+			for (Object[] obj : list1) {
+				Object[] data = (Object[]) obj;
+				if (data[0].equals(bn + by)) {
+					vo.setByyyhxzs1(Integer.parseInt(data[1] + ""));
+					vo.setByyyhbzs1(Integer.parseInt(data[2] + ""));
+					vo.setByyyhxzs2(Integer.parseInt(data[3] + ""));
+					vo.setByyyhbzs2(Integer.parseInt(data[4] + ""));
+					vo.setByyyhxzs3(Integer.parseInt(data[5] + ""));
+					vo.setByyyhbzs3(Integer.parseInt(data[6] + ""));
+					vo.setByyyhxzs4(Integer.parseInt(data[7] + ""));
+					vo.setByyyhbzs4(Integer.parseInt(data[8] + ""));
+					// 默认新开辟航线数为本月数量
+					vo.setByxkphxs1(vo.getByyyhxzs1());
+					vo.setByxkphxs2(vo.getByyyhxzs2());
+					vo.setByxkphxs3(vo.getByyyhxzs3());
+					vo.setByxkphxs4(vo.getByyyhxzs4());
+				} else if (data[0].equals(sn + sy)) {
+					int t1 = Integer.parseInt(data[1] + "");
+					vo.setByxkphxs1(vo.getByyyhxzs1() - t1 < 0 ? 0 : vo.getByyyhxzs1() - t1);
+					vo.setBytkhxs1(t1 - vo.getByyyhxzs1() < 0 ? 0 : t1 - vo.getByyyhxzs1());
+					int t2 = Integer.parseInt(data[3] + "");
+					vo.setByxkphxs2(vo.getByyyhxzs2() - t2 < 0 ? 0 : vo.getByyyhxzs2() - t2);
+					vo.setBytkhxs2(t2 - vo.getByyyhxzs2() < 0 ? 0 : t2 - vo.getByyyhxzs2());
+					int t3 = Integer.parseInt(data[5] + "");
+					vo.setByxkphxs3(vo.getByyyhxzs3() - t3 < 0 ? 0 : vo.getByyyhxzs3() - t3);
+					vo.setBytkhxs3(t3 - vo.getByyyhxzs3() < 0 ? 0 : t3 - vo.getByyyhxzs3());
+					int t4 = Integer.parseInt(data[7] + "");
+					vo.setByxkphxs4(vo.getByyyhxzs4() - t4 < 0 ? 0 : vo.getByyyhxzs4() - t4);
+					vo.setBytkhxs1(t4 - vo.getByyyhxzs4() < 0 ? 0 : t4 - vo.getByyyhxzs4());
+
 				}
 			}
 		}
-		int hxlxcount1 = 0;
-		int hxlxcount2 = 0;
-		int hxlxcount3 = 0;
-		int hxlxcount4 = 0;
-		for(int i=0;i<hxgl.size();i++){
-			if(hxgl.get(i).getHxlx().getId().equals("7001")){
-				hxlxcount1=hxlxcount1+1;
-			}
-			if(hxgl.get(i).getHxlx().getId().equals("7002")){
-				hxlxcount2=hxlxcount2+1;
-			}
-			if(hxgl.get(i).getHxlx().getId().equals("7003")){
-				hxlxcount3=hxlxcount3+1;
-			}
-			if(hxgl.get(i).getHxlx().getId().equals("7004")){
-				hxlxcount4=hxlxcount4+1;
-			}
-		}
-		vo.setByxkphxs1((hxlxcount1-count1)+"");
-		vo.setByxkphxs2((hxlxcount2-count2)+"");
-		vo.setByxkphxs3((hxlxcount3-count3)+"");
-		vo.setByxkphxs4((hxlxcount4-count4)+"");
-		//填表人跟联系电话
+		/*
+		 * //航线航班本月营运航线 List<Object>
+		 * list1=hxglService.hxhbyytj(StringUtils.isEmpty(rq)?benyue:rq,
+		 * StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+		 * vo.setByyyhxzs1(list1.get(0).toString());
+		 * vo.setByyyhxzs2(list1.get(1).toString());
+		 * vo.setByyyhxzs3(list1.get(2).toString());
+		 * vo.setByyyhxzs4(list1.get(3).toString()); //本月航班数量按照航线类型分组
+		 * List<Object>
+		 * list2=hxglService.hbyytj(StringUtils.isEmpty(rq)?benyue:rq,
+		 * StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+		 * vo.setByyyhbzs1(list2.get(0).toString());
+		 * vo.setByyyhbzs2(list2.get(1).toString());
+		 * vo.setByyyhbzs3(list2.get(2).toString());
+		 * vo.setByyyhbzs4(list2.get(3).toString()); //本月停航航班数量按照航线类型分组
+		 * List<Object>
+		 * list3=hxglService.bytyhxs(StringUtils.isEmpty(rq)?benyue:rq,
+		 * StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+		 * vo.setBytkhxs1(list3.get(0).toString());
+		 * vo.setBytkhxs2(list3.get(1).toString());
+		 * vo.setBytkhxs3(list3.get(2).toString());
+		 * vo.setBytkhxs4(list3.get(3).toString()); //按照日期统计所有本月航线(名称)
+		 * List<HxglEntity>
+		 * hxgl=hxglService.findByRqAndSzgk(StringUtils.isEmpty(
+		 * rq)?benyue:rq,StringUtils.isEmpty(szgkid)?dftszgk:szgkid); String
+		 * lastmonth=""; if(StringUtils.isEmpty(rq)){ Integer i =
+		 * Integer.parseInt(benyue.substring(5, 7))-1; if(i<10){
+		 * lastmonth=benyue.substring(0, 5)+"0"+i; }else{
+		 * lastmonth=benyue.substring(0, 5)+i; } }else{ Integer i =
+		 * Integer.parseInt(rq.substring(5, 7))-1; if(i<10){
+		 * lastmonth=rq.substring(0, 5)+"0"+i; }else{ lastmonth=rq.substring(0,
+		 * 5)+i; } } //按照日期统计所有上个月月航线(名称) List<HxglEntity>
+		 * lasthxgl=hxglService.findByRqAndSzgk
+		 * (lastmonth,StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+		 * //count表示本月航线名称与上月航线名称相同的航线总数 int count1 = 0; int count2 = 0; int
+		 * count3 = 0; int count4 = 0; for(int i=0;i<hxgl.size();i++){ for(int
+		 * j=0;j<lasthxgl.size();j++){
+		 * if(hxgl.get(i).getHxlx().getId().equals("7001")){
+		 * if(hxgl.get(i).getHxmc
+		 * ().equals(lasthxgl.get(j).getHxmc())&&lasthxgl.get
+		 * (j).getHxlx().getId().equals("7001")){ count1=count1+1; break; }
+		 * }else
+		 * if(hxgl.get(i).getHxlx().getId().equals("7002")&&lasthxgl.get(j)
+		 * .getHxlx().getId().equals("7002")){
+		 * if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
+		 * count2=count2+1; break; } }else
+		 * if(hxgl.get(i).getHxlx().getId().equals
+		 * ("7003")&&lasthxgl.get(j).getHxlx().getId().equals("7003")){
+		 * if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
+		 * count3=count3+1; break; } }else
+		 * if(hxgl.get(i).getHxlx().getId().equals
+		 * ("7004")&&lasthxgl.get(j).getHxlx().getId().equals("7004")){
+		 * if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
+		 * count4=count4+1; break; } } } } int hxlxcount1 = 0; int hxlxcount2 =
+		 * 0; int hxlxcount3 = 0; int hxlxcount4 = 0; for(int
+		 * i=0;i<hxgl.size();i++){
+		 * if(hxgl.get(i).getHxlx().getId().equals("7001")){
+		 * hxlxcount1=hxlxcount1+1; }
+		 * if(hxgl.get(i).getHxlx().getId().equals("7002")){
+		 * hxlxcount2=hxlxcount2+1; }
+		 * if(hxgl.get(i).getHxlx().getId().equals("7003")){
+		 * hxlxcount3=hxlxcount3+1; }
+		 * if(hxgl.get(i).getHxlx().getId().equals("7004")){
+		 * hxlxcount4=hxlxcount4+1; } } vo.setByxkphxs1((hxlxcount1-count1)+"");
+		 * vo.setByxkphxs2((hxlxcount2-count2)+"");
+		 * vo.setByxkphxs3((hxlxcount3-count3)+"");
+		 * vo.setByxkphxs4((hxlxcount4-count4)+"");
+		 */
+		// 填表人跟联系电话
 		vo.setTbr(securityMgr.getCurrUser().getName());
 		if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
 			vo.setLxdh(securityMgr.getCurrUser().getSsjyr().getLxdh());
-		}else{
-			vo.setLxdh(securityMgr.getCurrUser().getSsglbm()!=null?securityMgr.getCurrUser().getSsglbm().getLxdh():"");
+		} else {
+			vo.setLxdh(securityMgr.getCurrUser().getSsglbm() != null ? securityMgr.getCurrUser().getSsglbm().getLxdh() : "");
 		}
 		model.addAttribute("record", vo);
-		model.addAttribute("szgkid", StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
-		model.addAttribute("rq", rq!=null?rq:benyue);
+		model.addAttribute("szgkid", StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		model.addAttribute("rq", rq != null ? rq : benyue);
 		model.addAttribute("menuid", menuid);
 		return "gkyxtjyfx/hxhbtj/hxhbtj";
 	}

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/vo/HxhbtjVo.java

@@ -3,219 +3,273 @@ package com.xt.jygl.gkyxtjyfx.hxhbtj.vo;
 import com.xtframe.sec.common.BaseVo;
 
 public class HxhbtjVo extends BaseVo {
-	/*本月完成量*/
+	/* 本月完成量 */
 	private String bywcl = null;
-	/*本月外贸完成量*/
+	/* 本月外贸完成量 */
 	private String bywmwcl = null;
-	/*本月内贸完成量*/
+	/* 本月内贸完成量 */
 	private String bynmwcl = null;
-	/*本年累计量*/
+	/* 本年累计量 */
 	private String bnljl = null;
-	/*本年外贸累计量*/
+	/* 本年外贸累计量 */
 	private String bnwmljl = null;
-	/*本年内贸累计量*/
+	/* 本年内贸累计量 */
 	private String bnnmljl = null;
-	/*同比增长数*/
+	/* 同比增长数 */
 	private String tbzzs = null;
-	/*外贸同比增长数*/
+	/* 外贸同比增长数 */
 	private String wmtbzzs = null;
-	/*内贸同比增长数*/
+	/* 内贸同比增长数 */
 	private String nmtbzzs = null;
-	/*本月营运航线总数*/
-	private String byyyhxzs1 = null;
-	/*本月营运航线总数*/
-	private String byyyhxzs2 = null;
-	/*本月营运航线总数*/
-	private String byyyhxzs3 = null;
-	/*本月营运航线总数*/
-	private String byyyhxzs4 = null;
-	/*本月营运航班总数*/
-	private String byyyhbzs1 = null;
-	/*本月营运航班总数*/
-	private String byyyhbzs2 = null;
-	/*本月营运航班总数*/
-	private String byyyhbzs3 = null;
-	/*本月营运航班总数*/
-	private String byyyhbzs4 = null;
-	/*本月新开辟航线数*/
-	private String byxkphxs1 = null;
-	/*本月新开辟航线数*/
-	private String byxkphxs2 = null;
-	/*本月新开辟航线数*/
-	private String byxkphxs3 = null;
-	/*本月新开辟航线数*/
-	private String byxkphxs4 = null;
-	/*本月停开航线数*/
-	private String bytkhxs1 = null;
-	/*本月停开航线数*/
-	private String bytkhxs2 = null;
-	/*本月停开航线数*/
-	private String bytkhxs3 = null;
-	/*本月停开航线数*/
-	private String bytkhxs4 = null;
-	/*填表人*/
+	/* 本月营运航线总数 */
+	private int byyyhxzs1 = 0;
+	/* 本月营运航线总数 */
+	private int byyyhxzs2 = 0;
+	/* 本月营运航线总数 */
+	private int byyyhxzs3 = 0;
+	/* 本月营运航线总数 */
+	private int byyyhxzs4 = 0;
+	/* 本月营运航班总数 */
+	private int byyyhbzs1 = 0;
+	/* 本月营运航班总数 */
+	private int byyyhbzs2 = 0;
+	/* 本月营运航班总数 */
+	private int byyyhbzs3 = 0;
+	/* 本月营运航班总数 */
+	private int byyyhbzs4 = 0;
+	/* 本月新开辟航线数 */
+	private int byxkphxs1 = 0;
+	/* 本月新开辟航线数 */
+	private int byxkphxs2 = 0;
+	/* 本月新开辟航线数 */
+	private int byxkphxs3 = 0;
+	/* 本月新开辟航线数 */
+	private int byxkphxs4 = 0;
+	/* 本月停开航线数 */
+	private int bytkhxs1 = 0;
+	/* 本月停开航线数 */
+	private int bytkhxs2 = 0;
+	/* 本月停开航线数 */
+	private int bytkhxs3 = 0;
+	/* 本月停开航线数 */
+	private int bytkhxs4 = 0;
+	/* 填表人 */
 	private String tbr = null;
-	/*联系电话*/
+	/* 联系电话 */
 	private String lxdh = null;
+
 	public String getBywcl() {
 		return bywcl;
 	}
+
 	public void setBywcl(String bywcl) {
 		this.bywcl = bywcl;
 	}
+
 	public String getBywmwcl() {
 		return bywmwcl;
 	}
+
 	public void setBywmwcl(String bywmwcl) {
 		this.bywmwcl = bywmwcl;
 	}
+
 	public String getBynmwcl() {
 		return bynmwcl;
 	}
+
 	public void setBynmwcl(String bynmwcl) {
 		this.bynmwcl = bynmwcl;
 	}
+
 	public String getBnljl() {
 		return bnljl;
 	}
+
 	public void setBnljl(String bnljl) {
 		this.bnljl = bnljl;
 	}
+
 	public String getBnwmljl() {
 		return bnwmljl;
 	}
+
 	public void setBnwmljl(String bnwmljl) {
 		this.bnwmljl = bnwmljl;
 	}
+
 	public String getBnnmljl() {
 		return bnnmljl;
 	}
+
 	public void setBnnmljl(String bnnmljl) {
 		this.bnnmljl = bnnmljl;
 	}
+
 	public String getTbzzs() {
 		return tbzzs;
 	}
+
 	public void setTbzzs(String tbzzs) {
 		this.tbzzs = tbzzs;
 	}
+
 	public String getWmtbzzs() {
 		return wmtbzzs;
 	}
+
 	public void setWmtbzzs(String wmtbzzs) {
 		this.wmtbzzs = wmtbzzs;
 	}
+
 	public String getNmtbzzs() {
 		return nmtbzzs;
 	}
+
 	public void setNmtbzzs(String nmtbzzs) {
 		this.nmtbzzs = nmtbzzs;
 	}
-	public String getByyyhxzs1() {
+
+	public int getByyyhxzs1() {
 		return byyyhxzs1;
 	}
-	public void setByyyhxzs1(String byyyhxzs1) {
+
+	public void setByyyhxzs1(int byyyhxzs1) {
 		this.byyyhxzs1 = byyyhxzs1;
 	}
-	public String getByyyhxzs2() {
+
+	public int getByyyhxzs2() {
 		return byyyhxzs2;
 	}
-	public void setByyyhxzs2(String byyyhxzs2) {
+
+	public void setByyyhxzs2(int byyyhxzs2) {
 		this.byyyhxzs2 = byyyhxzs2;
 	}
-	public String getByyyhxzs3() {
+
+	public int getByyyhxzs3() {
 		return byyyhxzs3;
 	}
-	public void setByyyhxzs3(String byyyhxzs3) {
+
+	public void setByyyhxzs3(int byyyhxzs3) {
 		this.byyyhxzs3 = byyyhxzs3;
 	}
-	public String getByyyhxzs4() {
+
+	public int getByyyhxzs4() {
 		return byyyhxzs4;
 	}
-	public void setByyyhxzs4(String byyyhxzs4) {
+
+	public void setByyyhxzs4(int byyyhxzs4) {
 		this.byyyhxzs4 = byyyhxzs4;
 	}
-	public String getByyyhbzs1() {
+
+	public int getByyyhbzs1() {
 		return byyyhbzs1;
 	}
-	public void setByyyhbzs1(String byyyhbzs1) {
+
+	public void setByyyhbzs1(int byyyhbzs1) {
 		this.byyyhbzs1 = byyyhbzs1;
 	}
-	public String getByyyhbzs2() {
+
+	public int getByyyhbzs2() {
 		return byyyhbzs2;
 	}
-	public void setByyyhbzs2(String byyyhbzs2) {
+
+	public void setByyyhbzs2(int byyyhbzs2) {
 		this.byyyhbzs2 = byyyhbzs2;
 	}
-	public String getByyyhbzs3() {
+
+	public int getByyyhbzs3() {
 		return byyyhbzs3;
 	}
-	public void setByyyhbzs3(String byyyhbzs3) {
+
+	public void setByyyhbzs3(int byyyhbzs3) {
 		this.byyyhbzs3 = byyyhbzs3;
 	}
-	public String getByyyhbzs4() {
+
+	public int getByyyhbzs4() {
 		return byyyhbzs4;
 	}
-	public void setByyyhbzs4(String byyyhbzs4) {
+
+	public void setByyyhbzs4(int byyyhbzs4) {
 		this.byyyhbzs4 = byyyhbzs4;
 	}
-	public String getByxkphxs1() {
+
+	public int getByxkphxs1() {
 		return byxkphxs1;
 	}
-	public void setByxkphxs1(String byxkphxs1) {
+
+	public void setByxkphxs1(int byxkphxs1) {
 		this.byxkphxs1 = byxkphxs1;
 	}
-	public String getByxkphxs2() {
+
+	public int getByxkphxs2() {
 		return byxkphxs2;
 	}
-	public void setByxkphxs2(String byxkphxs2) {
+
+	public void setByxkphxs2(int byxkphxs2) {
 		this.byxkphxs2 = byxkphxs2;
 	}
-	public String getByxkphxs3() {
+
+	public int getByxkphxs3() {
 		return byxkphxs3;
 	}
-	public void setByxkphxs3(String byxkphxs3) {
+
+	public void setByxkphxs3(int byxkphxs3) {
 		this.byxkphxs3 = byxkphxs3;
 	}
-	public String getByxkphxs4() {
+
+	public int getByxkphxs4() {
 		return byxkphxs4;
 	}
-	public void setByxkphxs4(String byxkphxs4) {
+
+	public void setByxkphxs4(int byxkphxs4) {
 		this.byxkphxs4 = byxkphxs4;
 	}
-	public String getBytkhxs1() {
+
+	public int getBytkhxs1() {
 		return bytkhxs1;
 	}
-	public void setBytkhxs1(String bytkhxs1) {
+
+	public void setBytkhxs1(int bytkhxs1) {
 		this.bytkhxs1 = bytkhxs1;
 	}
-	public String getBytkhxs2() {
+
+	public int getBytkhxs2() {
 		return bytkhxs2;
 	}
-	public void setBytkhxs2(String bytkhxs2) {
+
+	public void setBytkhxs2(int bytkhxs2) {
 		this.bytkhxs2 = bytkhxs2;
 	}
-	public String getBytkhxs3() {
+
+	public int getBytkhxs3() {
 		return bytkhxs3;
 	}
-	public void setBytkhxs3(String bytkhxs3) {
+
+	public void setBytkhxs3(int bytkhxs3) {
 		this.bytkhxs3 = bytkhxs3;
 	}
-	public String getBytkhxs4() {
+
+	public int getBytkhxs4() {
 		return bytkhxs4;
 	}
-	public void setBytkhxs4(String bytkhxs4) {
+
+	public void setBytkhxs4(int bytkhxs4) {
 		this.bytkhxs4 = bytkhxs4;
 	}
+
 	public String getTbr() {
 		return tbr;
 	}
+
 	public void setTbr(String tbr) {
 		this.tbr = tbr;
 	}
+
 	public String getLxdh() {
 		return lxdh;
 	}
+
 	public void setLxdh(String lxdh) {
 		this.lxdh = lxdh;
 	}

gkjsjy/trunk/src/com/xt/jygl/lyl/service/impl/LylServiceImpl.java

@@ -24,15 +24,15 @@ public class LylServiceImpl  extends JyglBaseService<DcsbybbEntity, String>  imp
 	private static Map<String,String> sqlMap;
 	
 	static{
-/*		select szgk,SZGQ,ZYSL,decode(HWZL,'2501',0,ZYSL),decode(HWZL,'2501',ZYSLTEU,0) from(
-				select szgk,SZGQ,HWZL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from(
-				select t.SZGK,t.SZGQ,t.HWZL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t))*/
+/*		select szgk,SZGQ,ZYSL,decode(HWZLDEDL,'721701',0,ZYSL),decode(HWZLDEDL,'721701',ZYSLTEU,0) from(
+				select szgk,SZGQ,HWZLDEDL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from(
+				select t.SZGK,t.SZGQ,t.HWZLDEDL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t))*/
 		sqlMap=new HashMap<String,String>();
 		sqlMap.put("sql0_0", new StringBuffer().append("select gk.gkmc ,bb.v1,bb.v2,bb.v3,decode((v2+v3*10),0,'',round(v1/(v2+v3*10),2)||'') v4 from( ")
 				.append("select szgk,sum(ZYSL) v1,sum(vl1) v2,sum(vl2) v3 from( ")
-				.append("select szgk,SZGQ,ZYSL,decode(HWZL,'2501',0,ZYSL) vl1,decode(HWZL,'2501',ZYSLTEU,0) vl2 from( ")
-				.append("select szgk,SZGQ,HWZL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
-				.append("select t.SZGK,t.SZGQ,t.HWZL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=2016))) ")
+				.append("select szgk,SZGQ,ZYSL,decode(HWZLDEDL,'721701',0,ZYSL) vl1,decode(HWZLDEDL,'721701',ZYSLTEU,0) vl2 from( ")
+				.append("select szgk,SZGQ,HWZLDEDL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
+				.append("select t.SZGK,t.SZGQ,t.HWZLDEDL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=2016))) ")
 				.append("group by szgk) bb ")
 				.append("left join gk_basic_jsjy_gk_gk gk on gk.id=bb.szgk ")
 				.append("order by gk.orderid ")
@@ -40,19 +40,19 @@ public class LylServiceImpl  extends JyglBaseService<DcsbybbEntity, String>  imp
 		
 		sqlMap.put("sql1_0", new StringBuffer().append("select gk.gkmc ,bb.v1,bb.v2,bb.v3,decode((v2+v3*10),0,'',round(v1/(v2+v3*10),2)) v4 from( ")
 				.append("select szgk,sum(ZYSL) v1,sum(vl1) v2,sum(vl2) v3 from( ")
-				.append("select szgk,SZGQ,ZYSL,decode(HWZL,'2501',0,ZYSL) vl1,decode(HWZL,'2501',ZYSLTEU,0) vl2 from( ")
-				.append("select szgk,SZGQ,HWZL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
-				.append("select t.SZGK,t.SZGQ,t.HWZL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj))) ")
+				.append("select szgk,SZGQ,ZYSL,decode(HWZLDEDL,'721701',0,ZYSL) vl1,decode(HWZLDEDL,'721701',ZYSLTEU,0) vl2 from( ")
+				.append("select szgk,SZGQ,HWZLDEDL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
+				.append("select t.SZGK,t.SZGQ,t.HWZLDEDL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj))) ")
 				.append("group by szgk) bb ")
 				.append("left join gk_basic_jsjy_gk_gk gk on gk.id=bb.szgk ")
 				.append("order by gk.orderid ")
 				.toString());	
 		
-		sqlMap.put("sql1_1", new StringBuffer().append("select gq.gqmc ,bb.v1,bb.v2,bb.v3,decode((v2+v3*10),0,'',round(v1/(v2+v3*10),2)) v4 from( ")
-				.append("select szgq,sum(ZYSL) v1,sum(vl1) v2,sum(vl2) v3 from( ")
-				.append("select szgk,SZGQ,ZYSL,decode(HWZL,'2501',0,ZYSL) vl1,decode(HWZL,'2501',ZYSLTEU,0) vl2 from( ")
-				.append("select szgk,SZGQ,HWZL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
-				.append("select t.SZGK,t.SZGQ,t.HWZL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj and SZGK=(select id from gk_basic_jsjy_gk_gk where szd=:code and record_status=1) ))) ")
+		sqlMap.put("sql1_1", new StringBuffer()
+				.append("select gq.gqmc,bb.v1,bb.v2,bb.v3,round(v1/(select sum(mt.sjhwttl)*10000 from gk_basic_jsjy_jyr_mt mt where gq.id=mt.szgq and mt.record_status=1),2) v4 from (")
+				.append("select szgq, sum(ZYSL+vl2*10) v1, sum(vl1) v2, sum(vl2) v3 from (select szgk,SZGQ,ZYSL,decode(HWZLDEDL, '721701', 0, ZYSL) vl1,decode(HWZLDEDL, '721701', ZYSLTEU, 0) vl2 from (")
+				.append("select szgk,SZGQ,HWZLDEDL,decode(v2, 0, v1, v2) ZYSL,decode(v4, 0, v3, v4) ZYSLTEU from (")
+				.append("select t.SZGK,t.SZGQ,t.HWZLDEDL,nvl(t.ZYSL, 0) v1,nvl(t.ZYSLXG, 0) v2,nvl(t.ZYSLTEU, 0) v3,nvl(t.ZYSLTEUXG, 0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj, 'YYYY') = :bgsj and SZGK = (select id from gk_basic_jsjy_gk_gk where szd =:code and record_status = 1)))) ")
 				.append("group by szgq) bb ")
 				.append("left join gk_basic_jsjy_gk_gq gq on gq.id=bb.szgq ")
 				.append("order by gq.orderid ")
@@ -62,8 +62,8 @@ public class LylServiceImpl  extends JyglBaseService<DcsbybbEntity, String>  imp
 				.append("select a.szgk,a.sZYSL,b.sLINELENGTH from( ")
 				.append("select szgk,sum(ZYSL) sZYSL from( ")
 				.append("select szgk,SZGQ,ZYSL from( ")
-				.append("select szgk,SZGQ,HWZL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
-				.append("select t.SZGK,t.SZGQ,t.HWZL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj))) ")
+				.append("select szgk,SZGQ,HWZLDEDL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
+				.append("select t.SZGK,t.SZGQ,t.HWZLDEDL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj))) ")
 				.append("group by szgk) a ,(SELECT szgk,sum(LINELENGTH) sLINELENGTH from( ")
 				.append("select t.szgk,t.szgq,sclx,ssmt,mt.mtmc,mt.szax,LINELENGTH from GK_BASIC_JSJY_JYR_BW t  ")
 				.append("left join gk_basic_jsjy_jyr_mt mt on ssmt=mt.id ")
@@ -78,8 +78,8 @@ public class LylServiceImpl  extends JyglBaseService<DcsbybbEntity, String>  imp
 				.append("select a.szgq,a.sZYSL,b.sLINELENGTH from( ")
 				.append("select szgq,sum(ZYSL) sZYSL from( ")
 				.append("select szgk,SZGQ,ZYSL from( ")
-				.append("select szgk,SZGQ,HWZL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
-				.append("select t.SZGK,t.SZGQ,t.HWZL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj ")
+				.append("select szgk,SZGQ,HWZLDEDL,decode(v2,0,v1,v2) ZYSL ,decode(v4,0,v3,v4) ZYSLTEU from( ")
+				.append("select t.SZGK,t.SZGQ,t.HWZLDEDL,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.ZYSLTEU,0) v3,nvl(t.ZYSLTEUXG,0) v4 from GK_OPERATION_JSJY_DCSBYBB t where to_char(bgsj,'YYYY')=:bgsj ")
 				.append("and SZGK=(select id from gk_basic_jsjy_gk_gk where szd=:code and record_status=1)))) ")
 				.append("group by szgq) a,(SELECT szgq,sum(LINELENGTH) sLINELENGTH from( ")
 				.append("select t.szgk,t.szgq,sclx,ssmt,mt.mtmc,mt.szax,LINELENGTH from GK_BASIC_JSJY_JYR_BW t ")

gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

@@ -86,7 +86,7 @@ public class UserCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("user:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String menuid, final String username, final String uname, final String sfjyr,final String jyrname) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String menuid, final String username, final String uname, final String sfjyr) throws JsonProcessingException {
 		// 查詢條件
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "user");
 		Specification<UserEntity> spec = new Specification<UserEntity>() {
@@ -109,9 +109,6 @@ public class UserCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfjyr");
 				}
-				if (StringUtils.isNotEmpty(jyrname)) {
-					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyrname + "%"));
-				} 
 				if (isJyr()) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				}
@@ -147,7 +144,6 @@ public class UserCtl extends BaseWebCtl {
 		model.addAttribute("username", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "username"));
 		model.addAttribute("uname", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "uname"));
 		model.addAttribute("sfjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfjyr"));
-		model.addAttribute("jyrname", jyrname);
 		model.addAttribute("menuid", menuid);
 		// 翻页共通
 		putPageInfo(model, page, list);