Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -101,7 +101,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
             if (!TenantConstants.SUPER_ADMIN_ROLE_KEY.equals(permission) &&
                     !TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY.equals(permission) &&
                     !TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(permission)) {
-                Assert.isFalse(dProjectMapper.exists(new LambdaQueryWrapper<DProject>()
+                Assert.isTrue(dProjectMapper.exists(new LambdaQueryWrapper<DProject>()
                         .eq(DProject::getProjectName, addCbProjectBo.getProjectName())), "IPM系统中不存在该项目,请重新选择");
             }
         });

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbQuantitySummaryMapper.xml

@@ -91,11 +91,10 @@
             cqs.combined_price, cqs.combined_price_tax, cqs.brand_name, cqs.bid_source, cqs.remark, cqs.`number`, cqsa.quantities,
             cqsa.quantities_unit, cqsa.conversion_quantities, cqsa.conversion_unit, cqsa.purchase_unit_price, cqsa.create_time,
             cqsa.id actualId, cqsa.ipm_project_code, cqsa.ipm_contract_code, cqsa.ipm_biz_code, cqsa.push_quantities,
-            ifnull(sum(cqsa1.quantities),0) totalQuantities,ifnull(sum(cqsa2.push_quantities),0) cumulativeDifference
+            ifnull(sum(cqsa1.quantities),0) totalQuantities,ifnull(sum(cqsa1.push_quantities),0) cumulativeDifference
         from cb_quantity_summary cqs
         left join cb_quantity_summary_actual cqsa on (cqs.id = cqsa.cb_quantity_summary_id and cqsa.record_date = #{recordDate} )
         left join cb_quantity_summary_actual cqsa1 on (cqs.id = cqsa1.cb_quantity_summary_id and cqsa1.record_date <= #{recordDate} )
-        left join cb_quantity_summary_actual cqsa2 on cqs.id = cqsa2.cb_quantity_summary_id
         left join cb_subject cs1 on cqs.cb_subject_name = cs1.cb_subject_name
         where cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage}
         <if test="cbSubjectName != null and cbSubjectName !=''">