罗飒代码更新

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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/dcttltj/dcttltj.jsp

@@ -114,14 +114,14 @@
 	                }
 	            },
 	            title: {
-	                text: '',
+	                text: '单船作业吞吐量（万吨）',
 	                style: {
 	                    color: '#262626'
 	                }
 	            }
 	        }, { // Secondary yAxis
 	            title: {
-	                text: '',
+	                text: '单船作业申报数量（个）',
 	                style: {
 	                    color: '#262626'
 	                }

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

@@ -308,7 +308,7 @@ public class DcsbCtl extends BaseWebCtl {
 		}
 		Utils.getSession().setAttribute("userpre", user2);
 
-		page.setSort("id");
+		page.setSort("bgsj");
 		page.setOrder("desc");
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.dcsbpage);

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

@@ -32,4 +32,7 @@ public interface XkzxxDao extends SecRepository<XkzxxEntity, String> {
 
 	@Query("SELECT m FROM XkzxxEntity m WHERE m.yxqz<?1 and m.yxqz>?2 and m.gkjyr=?3 and m.recordStatus<>9")
 	List<XkzxxEntity> queryNeedWarn(Date newdate,Date date,String ssjyr);
+	
+	@Query("SELECT m from XkzxxEntity m where m.gkjyr =?1 and m.recordStatus = 1 and m.sfyx=1")
+	XkzxxEntity findVaildByJyrid(String jyrid);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/service/XkzxxService.java

@@ -38,4 +38,6 @@ public interface XkzxxService {
 	public void exportExcelAll(List<XkzxxVo> voList, ServletOutputStream outputStream);
 
 	public void setXkzxxSheet(List<XkzxxVo> voList, ServletOutputStream outputStream, XSSFWorkbook workBook);
+
+	public XkzxxEntity findVaildByJyrid(String jyrid);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/service/impl/XkzxxServiceImpl.java

@@ -5,7 +5,9 @@ import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+
 import javax.servlet.ServletOutputStream;
+
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -13,6 +15,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.ExportUtil;
 import com.xt.jygl.common.GlobalData;
@@ -251,4 +254,9 @@ public class XkzxxServiceImpl extends JyglBaseService<XkzxxEntity, String> imple
 //			}
 //		}
 //	}
+
+	@Override
+	public XkzxxEntity findVaildByJyrid(String jyrid) {
+		return dao.findVaildByJyrid(jyrid);
+	}
 }

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

@@ -279,9 +279,16 @@ public class LhbgCtl extends BaseWebCtl {
 	@RequiresPermissions("lhbg:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
+		XkzxxEntity xkz = new XkzxxEntity();
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (user.getSsjyr() != null) {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
+			xkz = xkzxxService.findVaildByJyrid(jyr.getId());
+			if(xkz != null){
+				jyr.setGkjyxkzh(xkz.getGkjyxkzh());
+				jyr.setFddbr(xkz.getFddbr());
+				jyr.setBgdz(xkz.getDz());
+			}
 		}
 		model.addAttribute("gkjyr", jyr);
 		model.addAttribute("sqr", user.getName());

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

@@ -286,6 +286,10 @@ public class LhyxCtl extends BaseWebCtl {
 			for (XkzxxEntity xkz : xkzs) {
 				if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 					model.addAttribute("yxrq", DateTime.toString(xkz.getYxqz()));
+					jyr.setGkjyxkzh(xkz.getGkjyxkzh());
+					jyr.setFddbr(xkz.getFddbr());
+					jyr.setBgdz(xkz.getDz());
+					jyr.setJyqy(xkz.getZyqyfw());
 				}
 			}
 		}