Browse Source

成本分配 事故单

liuchaohui 2 years ago
parent
commit
7972895076

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/SyCostAllocationAccidentMapper.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.cost.mapper;
 
 import java.util.List;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.cost.entity.SyCostAllocationAccident;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +17,7 @@ public interface SyCostAllocationAccidentMapper extends BaseMapper<SyCostAllocat
 	public boolean deleteByMainId(String mainId);
     
 	public List<SyCostAllocationAccident> selectByMainId(String mainId);
+
+	@DS("multi-three")
+	List<SyCostAllocationAccident> queryByCostAccident(String code);
 }

+ 33 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationAccidentMapper.xml

@@ -15,4 +15,37 @@
 		WHERE
 			 sy_cost_allocation_id = #{id} 		
 	</select>
+
+	<select id="queryByCostAccident" resultType="org.jeecg.modules.cost.entity.SyCostAllocationAccident">
+		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount
+					from UFDATA_901_2021.dbo.PurBillVouchs a
+					left join UFDATA_901_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
+					left join UFDATA_901_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
+					left join UFDATA_901_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
+					where cPBVBillType='03'
+					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
+					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2
+
+		union all
+
+		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount
+					from UFDATA_902_2021.dbo.PurBillVouchs a
+					left join UFDATA_902_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
+					left join UFDATA_902_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
+					left join UFDATA_902_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
+					where cPBVBillType='03'
+					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
+					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2
+
+		union all
+
+		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount
+					from UFDATA_903_2021.dbo.PurBillVouchs a
+					left join UFDATA_903_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
+					left join UFDATA_903_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
+					left join UFDATA_903_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode
+					where cPBVBillType='03'
+					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
+					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2;
+	</select>
 </mapper>

+ 1 - 34
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -586,40 +586,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         }
         
         //事故单
-        String sqlAccidentSheet = 
-                "SELECT ah.cPBVCode as accidentNum,VEN.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount " +
-                        "  from UFDATA_901_2021.dbo.PurBillVouchs a " +
-                        "  left join UFDATA_901_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid " +
-                        "  left join UFDATA_901_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode " +
-                        "  left join UFDATA_901_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode " +
-                        "  where cPBVBillType='03' " +
-                        "   and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT('"+plannum+"','%') " +
-                        "  group by ah.cPBVCode,VEN.cVenAbbName,ah.cDefine2 " +
-                        "  union all " +
-                "SELECT ah.cPBVCode as accidentNum,VEN.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount " +
-                        "  from UFDATA_902_2021.dbo.PurBillVouchs a " +
-                        "  left join UFDATA_902_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid " +
-                        "  left join UFDATA_902_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode " +
-                        "  left join UFDATA_902_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode " +
-                        "  where cPBVBillType='03' " +
-                        "   and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT('"+plannum+"','%') " +
-                        "  group by ah.cPBVCode,VEN.cVenAbbName,ah.cDefine2 " +
-                        "  union all " +
-                "SELECT ah.cPBVCode as accidentNum,VEN.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount " +
-                        "  from UFDATA_903_2021.dbo.PurBillVouchs a " +
-                        "  left join UFDATA_903_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid " +
-                        "  left join UFDATA_903_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode " +
-                        "  left join UFDATA_903_2021.dbo.Vendor ven on ven.cVenCode=ah.cvencode " +
-                        "  where cPBVBillType='03' " +
-                        "   and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT('"+plannum+"','%') " +
-                        "  group by ah.cPBVCode,VEN.cVenAbbName,ah.cDefine2";
-        List<Map<String, Object>> accidentSheetList  = senYuDataSourceOne.queryForList(sqlAccidentSheet);
-        List<JSONObject> accidentSheet = JsonChangeUtils.toJSONObject(accidentSheetList);
-        List<SyCostAllocationAccident> syCostAllocationAccident = new ArrayList<>();
-        for (int i=0;i<accidentSheet.size();i++) {
-            SyCostAllocationAccident syCostAllocationCostpay = JSONObject.toJavaObject(accidentSheet.get(i), SyCostAllocationAccident.class);
-            syCostAllocationAccident.add(syCostAllocationCostpay);
-        }
+        List<SyCostAllocationAccident> syCostAllocationAccident = syCostAllocationAccidentMapper.queryByCostAccident(plannum);
         syCostAllocation.setSyCostAllocationAccidentList(syCostAllocationAccident);
 
         //费用支出