|
@@ -115,6 +115,8 @@ public class XmIntangibleAssetServiceImpl extends BaseServiceImpl<XmIntangibleAs
|
|
|
asset.setYearAndMonth(yearAndMonth);
|
|
asset.setYearAndMonth(yearAndMonth);
|
|
|
asset.setXmId(dbAsset.getXmId());
|
|
asset.setXmId(dbAsset.getXmId());
|
|
|
asset.setZcbm(dbAsset.getZcbm());
|
|
asset.setZcbm(dbAsset.getZcbm());
|
|
|
|
|
+ asset.setUserUnicode(dbAsset.getUserUnicode());
|
|
|
|
|
+ asset.setUserName(dbAsset.getUserName());
|
|
|
insertList.add(asset);
|
|
insertList.add(asset);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -186,6 +188,10 @@ public class XmIntangibleAssetServiceImpl extends BaseServiceImpl<XmIntangibleAs
|
|
|
xmIdMap.put(xmkey, xmId);
|
|
xmIdMap.put(xmkey, xmId);
|
|
|
|
|
|
|
|
List<String> zcbmList = map.get(xmId);
|
|
List<String> zcbmList = map.get(xmId);
|
|
|
|
|
+ if(Func.isEmpty(zcbmList)){
|
|
|
|
|
+ zcbmList = new ArrayList<>();
|
|
|
|
|
+ map.put(xmId, zcbmList);
|
|
|
|
|
+ }
|
|
|
if (zcbmList.contains(excel.getZcbm())) {
|
|
if (zcbmList.contains(excel.getZcbm())) {
|
|
|
throw new ServiceException("序号为[" + excel.getXh() + "]的资产已存在");
|
|
throw new ServiceException("序号为[" + excel.getXh() + "]的资产已存在");
|
|
|
}else {
|
|
}else {
|
|
@@ -280,7 +286,7 @@ public class XmIntangibleAssetServiceImpl extends BaseServiceImpl<XmIntangibleAs
|
|
|
data.put("sysm", temp.getAsset().getSysm());
|
|
data.put("sysm", temp.getAsset().getSysm());
|
|
|
data.put("ysysm", temp.getAsset().getYsysm());
|
|
data.put("ysysm", temp.getAsset().getYsysm());
|
|
|
data.put("zcyz", temp.getAsset().getZcyz());
|
|
data.put("zcyz", temp.getAsset().getZcyz());
|
|
|
- data.put("jcz", temp.getAsset().getJcz());
|
|
|
|
|
|
|
+ data.put("jcz", "/");
|
|
|
data.put("yzje", temp.getAsset().getYzje());
|
|
data.put("yzje", temp.getAsset().getYzje());
|
|
|
data.put("userName", temp.getUserName());
|
|
data.put("userName", temp.getUserName());
|
|
|
Optional<AssetStatusEnum> optional = Arrays.stream(AssetStatusEnum.values()).filter(o -> o.getCode() == temp.getAsset().getStatus()).findFirst();
|
|
Optional<AssetStatusEnum> optional = Arrays.stream(AssetStatusEnum.values()).filter(o -> o.getCode() == temp.getAsset().getStatus()).findFirst();
|
|
@@ -349,11 +355,11 @@ public class XmIntangibleAssetServiceImpl extends BaseServiceImpl<XmIntangibleAs
|
|
|
data.put("zclb", temp.getAsset().getZclb());
|
|
data.put("zclb", temp.getAsset().getZclb());
|
|
|
data.put("yt", temp.getAsset().getYt());
|
|
data.put("yt", temp.getAsset().getYt());
|
|
|
data.put("zcyz", temp.getAsset().getZcyz());
|
|
data.put("zcyz", temp.getAsset().getZcyz());
|
|
|
- data.put("jcz", temp.getAsset().getJcz());
|
|
|
|
|
|
|
+ data.put("jcz", "/");
|
|
|
data.put("yzje", temp.getAsset().getYzje());
|
|
data.put("yzje", temp.getAsset().getYzje());
|
|
|
data.put("attendanceHours", temp.getAttendanceHours());
|
|
data.put("attendanceHours", temp.getAttendanceHours());
|
|
|
data.put("workHours", temp.getWorkHours());
|
|
data.put("workHours", temp.getWorkHours());
|
|
|
- data.put("yanfaFenTanLv", temp.getYanfaFenTanLv());
|
|
|
|
|
|
|
+ data.put("yanfaFenTanLv", temp.getYanfaFenTanLv()*100);
|
|
|
data.put("yanfaTanXiao", temp.getYanfaTanXiao());
|
|
data.put("yanfaTanXiao", temp.getYanfaTanXiao());
|
|
|
results.add(data);
|
|
results.add(data);
|
|
|
});
|
|
});
|