Skip to content

K
kwell-mes
Commit eee9fe4f authored by 黄自鹏's avatar 黄自鹏
Browse files
Options

调整bug

parent 6a4b51ac
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 22 deletions
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ eee9fe4f
......@@ -1470,12 +1470,12 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" order by GPFK_FKSJ DESC ");
return sqlMap.queryEntity(FkVO.class);
}
@Override
public FkVO queryKwellWxWoBySnidUptoDate(String wosnid) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select top 1 WO_ID,WO_ZT,WLXX_CODE,WLXX_GG,WLXX_ID,WOSN_CODE,WOSN_ID,");
sqlMap.append(" WLXX_GG,WO_DJID,WOSN_CODE ");
sqlMap.append(" WO_DJID ");
sqlMap.append("from WOSN ");
sqlMap.append(" left join WO on WO_ID=WOSN_WOID");
sqlMap.append(" left join WLXX on wlxx_id = wo_wlid");
......@@ -1834,7 +1834,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" and WOGYLX_XH >= :pXH ");
sqlMap.append("order by WOGYLX_XH desc");
sqlMap.setParamValue("pXH",wogylx.getXh());
return sqlMap.query(Wogylx.class);
return sqlMap.query(Wogylx.class);
}
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java
View file @ eee9fe4f
......@@ -37,7 +37,7 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
sqlMap.append(" left join WO on WO_ID = WOSN_WOID ");
sqlMap.append(" left join WLXX on WLXX_ID = WO_WLID ");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = GPFK_FKGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append(" left join BZGX on BZGX_ID = U_GPFK_BZGXID ");
sqlMap.append(" left join GZZX on GZZX_ID = BZGX_GZZXID ");
sqlMap.append(" where 1=1 ");
if ( StringUtils.isNotEmpty(condition.getGzzxid())){
......
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ eee9fe4f
......@@ -103,13 +103,13 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Autowired
private CommonService commonService;
@Autowired
private GpfkjgService gpfkjgService;
@Autowired
private BzgxService bzgxService;
@Autowired
private WogylxService wogylxService;
......@@ -1499,7 +1499,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
public List<WobomVO> queryWobomByWoUpgrade(String wosn,String bzgx) {
return gpfkDao.queryWobomByWosnAndBzgx(wosn,bzgx);
}
/** 新增反馈结果集 */
public void addOrUpdateGpfkjg(String wlid,String bzgxid,String wogylxid,String wosncode,String hgbz) {
GpfkjgCondition gpfkjgCondition =new GpfkjgCondition();
......@@ -1534,7 +1534,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
wogylxService.update(wogylx);
}
gpfkjg.setHgbz(BHGBZ);
}
gpfkjg.setFklx(GpfkFklxEnum.WO.getId());
if(hgbz.equals(HGBZ)) {
......@@ -1578,7 +1578,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfkjg.setBhgsl(0.0);
gpfkjg.setFksl(1.0);
update(gpfkjg);
}
}
}
......@@ -1685,7 +1685,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
return null;
}
@Override
public FkVO jyfkUpgrade(FkCondition fkCondition) {
/*
......@@ -1767,7 +1767,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
insert(gpfk);
FkVO newFkVo =gpfkDao.queryWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
newFkVo.setSntype(snType);
addOrUpdateGpfkjg(newFkVo.getWlid(), fkCondition.getBzgxid(), newFkVo.getFkgx(), fkCondition.getWosncode(), BHGBZ);
addOrUpdateGpfkjg(newFkVo.getWlid(), fkCondition.getBzgxid(), newFkVo.getFkgx(), fkCondition.getWosncode(), BHGBZ);
return newFkVo;
}
else {
......@@ -1775,7 +1775,7 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
return null;
}
@Override
public FkVO wxfkUpgrade(FkCondition fkCondition) {
/*
......@@ -1800,12 +1800,16 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
GpfkCondition gpfkCondition = new GpfkCondition();
gpfkCondition.setWosnid(fkCondition.getSncode());
gpfkCondition.setBzgxid(fkCondition.getBzgxid());
FkVO curFkVo = gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getSncode());
checkLastBzgxIfComplete(curFkVo);
checkNextBzgxIfExistFk(curFkVo);
if(StringUtils.isNotEmpty(curFkVo.getId())) {
curFkVo = gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
}
//FkVO curFkVo = gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getSncode());
//checkLastBzgxIfComplete(curFkVo);
//checkNextBzgxIfExistFk(curFkVo);
// if(StringUtils.isNotEmpty(curFkVo.getId())) {
// curFkVo = gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
// }
FkVO curFkVo = gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getSncode(), fkCondition.getBzgxid());
if (curFkVo == null) {
curFkVo = gpfkDao.queryKwellWxWoBySnidUptoDate(fkCondition.getSncode());
}
curFkVo.setSntype(snType);
return curFkVo;
}
......@@ -1826,9 +1830,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0);
gpfk.setBzgxid(fkCondition.getBzgxid());
insert(gpfk);
gpfk.setFkgx(fkCondition.getBzgxid());
insert(gpfk);
FkVO newFkVo =gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
addOrUpdateGpfkjg(curFkVo.getWlid(), fkCondition.getBzgxid(), null, curFkVo.getWosnCode(), HGBZ);
addOrUpdateGpfkjg(curFkVo.getWlid(), fkCondition.getBzgxid(), fkCondition.getBzgxid(), curFkVo.getWosnCode(), HGBZ);
newFkVo.setSntype(snType);
return newFkVo;
}
......@@ -1849,9 +1854,10 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setHgsl(1.0);
gpfk.setBhgsl(0.0);
gpfk.setBzgxid(fkCondition.getBzgxid());
insert(gpfk);
gpfk.setFkgx(fkCondition.getBzgxid());
insert(gpfk);
FkVO newFkVo =gpfkDao.queryWxWowithIfExistGpfkByWosnAndBzgxidInNewDate(fkCondition.getWosncode(), fkCondition.getBzgxid());
addOrUpdateGpfkjg(curFkVo.getWlid(), fkCondition.getBzgxid(), null, curFkVo.getWosnCode(), BHGBZ);
addOrUpdateGpfkjg(curFkVo.getWlid(), fkCondition.getBzgxid(), fkCondition.getBzgxid(), curFkVo.getWosnCode(), BHGBZ);
newFkVo.setSntype(snType);
return newFkVo;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment