zhouli 5 months ago
parent
commit
82013be3e7

+ 2 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmTechnicianMapper.xml

@@ -449,7 +449,7 @@
             kd_xm_technician m
             kd_xm_technician m
         WHERE
         WHERE
             m.tenant_id = #{tenantId} and LEFT(m.year_and_month,4)= #{year}
             m.tenant_id = #{tenantId} and LEFT(m.year_and_month,4)= #{year}
-        GROUP BY v.xm_id, m.unicode,m.year_and_month
-        order by v.xm_id asc
+        GROUP BY m.xm_id, m.unicode,m.year_and_month
+        order by m.xm_id asc
     </select>
     </select>
 </mapper>
 </mapper>

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/AssetServiceImpl.java

@@ -105,7 +105,7 @@ public class AssetServiceImpl extends BaseServiceImpl<AssetMapper, AssetEntity>
 		List<Object> data = listener.getDataList();
 		List<Object> data = listener.getDataList();
 
 
 		List<AssetEntity> dbAssetList = baseMapper.selectList(Wrappers.<AssetEntity>lambdaQuery().eq(AssetEntity::getYearAndMonth, yearAndMonth));
 		List<AssetEntity> dbAssetList = baseMapper.selectList(Wrappers.<AssetEntity>lambdaQuery().eq(AssetEntity::getYearAndMonth, yearAndMonth));
-		List<String> idenfifierList = new ArrayList<>(dbAssetList.stream().map(tmp -> tmp.getZcbm() + ":" + tmp.getZcmc()).toList());
+		List<String> idenfifierList = new ArrayList<>(dbAssetList.stream().map(AssetEntity::getZcbm).toList());
 
 
 		for (Object excel : data) {
 		for (Object excel : data) {
 			AssetExcel excel1 = (AssetExcel) excel;
 			AssetExcel excel1 = (AssetExcel) excel;