|
|
@@ -1379,10 +1379,12 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
|
|
|
}
|
|
|
|
|
|
// 1.安装工单主表基础信息更新 需进行最后修改时间比较
|
|
|
- if (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
|
|
|
+ /*if (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
|
|
|
log.info("修改工单主表基础信息");
|
|
|
upBase(old, item, lclsNew);
|
|
|
- }
|
|
|
+ }*/
|
|
|
+ // 去掉限制直接修改
|
|
|
+ upBase(old, item, lclsNew);
|
|
|
|
|
|
|
|
|
// 2:网点信息修改 已待服务人员处理，不允更新网点 6,7,10
|
|
|
@@ -1514,9 +1516,11 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
|
|
|
old.setStreet(lclsNew.getStreet());
|
|
|
old.setStreetId(lclsNew.getStreetId());
|
|
|
old.setRemark(lclsNew.getRemark());
|
|
|
- if (lclsNew.getUndoneNum()< old.getUndoneNum()){
|
|
|
+ old.setTotalNum(lclsNew.getTotalNum());
|
|
|
+ old.setUndoneNum(lclsNew.getUndoneNum());
|
|
|
+ /*if (lclsNew.getUndoneNum()< old.getUndoneNum()){
|
|
|
old.setUndoneNum(lclsNew.getUndoneNum());
|
|
|
- }
|
|
|
+ }*/
|
|
|
old.setWorkerId(lclsNew.getWorkerId());
|
|
|
old.setWorkerName(lclsNew.getWorkerName());
|
|
|
// old.set(lclsNew.get());
|
|
|
@@ -2826,6 +2830,10 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
|
|
|
|
|
|
// 生成工单基础表 对象
|
|
|
orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
|
|
|
+ // 未完成数据修改 如果工单关闭就用wwsl，否则用安装数量
|
|
|
+ if (!(item.getDqjd().equals(1304) || item.getDqjd().equals(1309))){
|
|
|
+ orderBase.setUndoneNum(item.getAzsl());
|
|
|
+ }
|
|
|
|
|
|
orderBase.setSource("GREE");
|
|
|
orderBase.setId("G" + IdWorker.getIdStr());
|
yaozhixue