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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/DcController.java

@@ -526,6 +526,9 @@ public class DcController extends BaseController {
 	public BusinessContext getDcxxById(Long dcId) {
 		BusinessContext bc = new BusinessContext();
 		DcEntity dcEntity = dcService.findOne(dcId);
+		if (dcEntity.getTaskList() != null && dcEntity.getTaskList().size() > 0) {
+			dcEntity.getTaskList().get(0);
+		}
 		List<AccessoryEntity> acc;
 		List<byte[]> list;
 		if (BaseEntity.RECORD_STATE_DELETE == dcEntity.getRecordStatus()) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/zdwxyfb/CgController.java

@@ -198,12 +198,11 @@ public class CgController extends BaseController {
 					i + "",
 					null == entity.getDwmc() ? "" : entity.getDwmc().getGkjyr(),
 					entity.getCgqmc(),
-					entity.getJtwz(),
-					null == entity.getCgqmj() ? "" : entity.getCgqmj() + "",
-					entity.getCggs() + "",
+					entity.getCgmc(),
+					entity.getCgcz(),
 					entity.getHxpmc(),
 					entity.getQyccbh(),
-					null == entity.getHxpsl() ? "" : entity.getHxpsl() + "",
+					null == entity.getCgrj() ? "" : entity.getCgrj() + "",
 					entity.getGkzdwxybh(),
 					null == entity.getSzd() ? "" : resource.getString(entity
 							.getSzd().getName()),

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -3874,9 +3874,9 @@ public class ZysqbpController extends BaseController {
 							entity.getXzxdrmc(),
 							entity.getTyshxydm(),
 							entity.getZzjgdm(),
-							null == entity.getXksxq() ? "" : sdf4.format(entity
+							null == entity.getXksxq() ? "" : sdf.format(entity
 									.getXksxq()),
-							null == entity.getXkjzq() ? "" : sdf4.format(entity
+							null == entity.getXkjzq() ? "" : sdf.format(entity
 									.getXkjzq()), entity.getXkjg(),
 							entity.getBz(), entity.getDfbm(),
 							entity.getFddbrxm(), entity.getFddbrsfzh(),

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/auth/UserDao.java

@@ -48,7 +48,7 @@ public interface UserDao extends MyRepository<UserEntity, Long> {
 	@Query(value = "select u.* from T_YJPT_USER u,T_YJPT_ROLE_USER ru where u.id = ru.userid and ru.roleid = 1 and u.record_status<>9", nativeQuery = true)
 	public List<UserEntity> findAdmin();
 
-	@Query(value = "select u.* from t_yjpt_user u,t_yjpt_aqpjjgxx j,t_yjpt_role_user r where u.id=r.userid and u.aqpjjgid=j.id and r.roleid=7 j.jgmc=?1 and u.record_status<>9 and j.record_status<>9", nativeQuery = true)
+	@Query(value = "select u.* from t_yjpt_user u,t_yjpt_aqpjjgxx j,t_yjpt_role_user r where u.id=r.userid and u.aqpjjgid=j.id and r.roleid=7 and j.jgmc=?1 and u.record_status<>9 and j.record_status<>9", nativeQuery = true)
 	public List<UserEntity> findJgAdmin(String jgmc);
 
 	@Query("from UserEntity where szd=?1 and sfjyr='N'")