修改BUG

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java

@@ -444,7 +444,8 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
         sqlMap.append("      select GPFK_ID, GPFK_FKSJ, GPFK_FKJSSJ, GPFK_HGBZ, GPFK_FKSL, ");
         sqlMap.append("        GPFK_HGSL, GPFK_BHGSL, GPFK_FKR, BZGX_NAME,BZGX_CODE, BZGX_GXLX ");
         sqlMap.append("      from GPFK ");
-        sqlMap.append("        left join BZGX on BZGX_ID = GPFK_FKGX ");
+        sqlMap.append("        left join WOGYLX on WOGYLX_ID = GPFK_FKGX ");
+        sqlMap.append("        left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
         sqlMap.append("      where 1 = 1 ");
         sqlMap.append("        and GPFK_WOSNID = :pCode ");
         sqlMap.setParamValue("pCode",wosnid);

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java

@@ -36,7 +36,8 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("	  left join WOSN on WOSN_CODE = GPFK_WOSNID ");
         sqlMap.append("	  left join WO on WO_ID = WOSN_WOID   ");
         sqlMap.append("	  left join WLXX on WLXX_ID = WO_WLID   ");
-        sqlMap.append("	  left join BZGX on BZGX_ID = GPFK_FKGX   ");
+        sqlMap.append("	  left join WOGYLX on WOGYLX_ID = GPFK_FKGX   ");
+        sqlMap.append("	  left join BZGX on BZGX_ID = WOGYLX_BZGXID   ");
         sqlMap.append("	  left join GZZX on GZZX_ID = BZGX_GZZXID ");
         sqlMap.append("	where 1=1 ");
         if ( StringUtils.isNotEmpty(condition.getGzzxid())){
@@ -44,7 +45,7 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         }
 
         if (StringUtils.isNotEmpty(condition.getBzgxid())){
-            sqlMap.append(" and " + SqlUtil.getWhereEqualSql("GPFK_FKGX", condition.getBzgxid().split(",")));
+            sqlMap.append(" and " + SqlUtil.getWhereEqualSql("BZGX_ID", condition.getBzgxid().split(",")));
         }
 
         if (StringUtils.isNotEmpty(condition.getBxid())){

gavel/src/main/java/com/gavel/kwell/dao/impl/GphyDaoImpl.java

@@ -24,8 +24,9 @@ public class GphyDaoImpl extends BaseDaoImpl implements GphyDao {
         sqlMap.append("select GPHY_ID, GPHY_MID, GPHY_WLSNID, GPHY_FKSJ, GPHY_ZPSL, ");
         sqlMap.append("   GPHY_CXSL, GPHY_FKR, GPHY_FKGX, GPHY_BZ, GPHY_WHRID, ");
         sqlMap.append("   GPHY_WHR, GPHY_WHSJ, GPHY_CJRID, GPHY_CJR, GPHY_CJSJ, ");
-        sqlMap.append("   GPHY_SYSVERSION, GPHY_WLID, GPHY_HYLX, GPHY_FKRID ");
+        sqlMap.append("   GPHY_SYSVERSION, GPHY_WLID, GPHY_HYLX, GPHY_FKRID,WLXX_NAME,WLXX_CODE,WLXX_GG ");
         sqlMap.append("from GPHY ");
+        sqlMap.append("                left join WLXX on WLXX_ID = GPHY_WLID ");
         sqlMap.append("where 1 = 1 ");
         if (StringUtils.isNotEmpty(condition.getId())){
             sqlMap.append("  and " + SqlUtil.getWhereSql("GPHY_ID", condition.getId()));

gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java

@@ -1003,9 +1003,11 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
 				gphy.setWlid(wlid);
 				gphy.setMid(gpfkVo.getId());
 				gphy.setWlsnid(fkCondition.getSncode());
+				gphy.setFkrid(UserInfoUtil.getId());
+				gphy.setFkr(UserInfoUtil.getUserName());
 				gphy.setFksj(DateUtils.getDateTime());
 				gphy.setZpsl(1.0);
-				gphy.setHylx(HzGylxEnum.ZP.getId());
+				gphy.setHylx("BOM");
 				gphyService.insert(gphy);
 			}
 			if(gphyDao.queryIfZpwc(hyCondition)==0) {