固定资产

src/main/java/com/dk/finance/mapper/fia/AssetMapper.java

@@ -45,4 +45,33 @@ public interface AssetMapper extends BaseMapper<Asset>{
      * @date   : 2025/5/22 13:02
      */
     List<Map<String,Object>> getAssetType(@Param("typeName") String typeName);
+
+    /**
+     * @desc   : 查询经手人
+     * @author : 夏常明
+     * @date   : 2025/5/23 11:18
+     */
+    List<Map<String,Object>> getStaffByName(@Param("staffName") String staffName,@Param("ownCpId") Integer ownCpId);
+
+    /**
+     * @desc   : 查询经手人
+     * @author : 夏常明
+     * @date   : 2025/5/23 11:18
+     */
+    List<Map<String,Object>> getOrgByName(@Param("orgName") String orgName,@Param("ownCpId") Integer ownCpId);
+
+    /**
+     * @desc   : 折旧方法
+     * @author : 夏常明
+     * @date   : 2025/5/23 13:24
+     */
+    List<Map<String,Object>> getCalcMethod(@Param("kindName") String kindName);
+
+    /**
+     * @desc   : 查询经手人
+     * @author : 夏常明
+     * @date   : 2025/5/23 11:18
+     */
+    List<Map<String,Object>> getSubject(@Param("subjectName") String subjectName,@Param("ownCpId") Integer ownCpId);
+
 }

src/main/java/com/dk/finance/mapper/fia/AssetMapper.xml

@@ -868,4 +868,54 @@
         WHERE
             fat.type_name = #{typeName}
     </select>
+
+    <!-- 查询经手人 -->
+    <select id="getStaffByName" resultMap="java.util.Map">
+        SELECT
+            staff_id,
+            staff_name
+        FROM
+            dkscu_b.t_mst_staff staff
+        WHERE
+            flg_valid
+          AND staff.own_cp_id = #{ownCpId}
+          AND staff.staff_name = #{staffName}
+    </select>
+
+    <!-- 查询经手部门 -->
+    <select id="getOrgByName" resultMap="java.util.Map">
+        SELECT
+            org.org_id,
+            org.org_name
+        FROM
+            dkscu_b.t_mst_organization org
+        WHERE
+            flg_valid
+          AND org.org_name = #{orgName}
+          AND org.own_cp_id = #{ownCpId}
+    </select>
+
+    <!-- 折旧方法 -->
+    <select id="getCalcMethod" resultMap="java.util.Map">
+        SELECT
+            kind_code
+        FROM
+            dkscu_bs.t_data_kind dk
+        WHERE
+            dk.flg_valid
+          AND myex.f_get_name_i18n (dk.kind_name_i18n,#{i18n} ) = #{kindName}
+    </select>
+
+    <!-- 会计科目 -->
+    <select id="getSubject" resultMap="java.util.Map">
+        SELECT
+            sub.subject_id
+        FROM
+            dkscu_b.t_fnc_subject sub
+        WHERE
+            sub.flg_valid
+          AND sub.subject_name =#{subjectName}
+          AND sub.own_cp_id = #{ownCpId}
+    </select>
+
 </mapper>

src/main/java/com/dk/finance/model/vo/fia/AssetVO.java

@@ -140,17 +140,26 @@ public class AssetVO implements Serializable {
     private BigDecimal sumAmtClear;
 
     @ApiModelProperty(value = "固定资产科目")
-    @Excel(name = "固定资产科目", orderNum = "16")
     private String assetSubjectId;
 
+    @ApiModelProperty(value = "固定资产科目")
+    @Excel(name = "固定资产科目", orderNum = "16")
+    private String assetSubjectName;
+
     @ApiModelProperty(value = "累计折旧科目")
-    @Excel(name = "累计折旧科目", orderNum = "17")
     private String calcSubjectId;
 
+    @ApiModelProperty(value = "累计折旧科目")
+    @Excel(name = "累计折旧科目", orderNum = "17")
+    private String calcSubjectName;
+
     @ApiModelProperty(value = "资产减值科目")
-    @Excel(name = "资产减值科目", orderNum = "18")
     private String lossSubjectId;
 
+    @ApiModelProperty(value = "资产减值科目")
+    @Excel(name = "资产减值科目", orderNum = "18")
+    private String lossSubjectName;
+
     @ApiModelProperty(value = "税率 (非专票固定资产取0)")
     private BigDecimal taxRate;
 

src/main/java/com/dk/finance/service/fia/AssetService.java

@@ -93,6 +93,8 @@ public class AssetService extends BaseService<Asset> implements AccountFeeBusine
 		StaffEntity staff = authUtils.getStaff();
 		Integer ctrCpId = staff.getCtrCpId();
 		Integer ownCpId = staff.getOwnCpId();
+		String staffId = staff.getStaffId();
+		String orgId = staff.getOrgId();
 		//循环导入数据
 		int num = 1;
 		for (AssetVO item : assetImport
@@ -115,7 +117,55 @@ public class AssetService extends BaseService<Asset> implements AccountFeeBusine
 					errMsg.add("第-"+num+ "-行数据,资产类别不存在！");
 				}
 				//经手人
-
+				List<Map<String,Object>> staffIdList = assetMapper.getStaffByName(assetVO.getStaffName(),ownCpId);
+				if(staffIdList!=null&&staffIdList.size()>0){
+					item.setStaffId( staffIdList.get(0).get("staff_id").toString());
+				}
+				else{
+					errorList.add(item);
+					errMsg.add("第-"+num+ "-行数据,经手人不存在！");
+				}
+				//经手部门
+				List<Map<String,Object>> orgIdList = assetMapper.getOrgByName(assetVO.getOrgName(),ownCpId);
+				if(orgIdList!=null&&orgIdList.size()>0){
+					item.setOrgId(orgIdList.get(0).get("org_id").toString());
+				}
+				else{
+					errorList.add(item);
+					errMsg.add("第-"+num+ "-行数据,经手部门不存在！");
+				}
+				//折旧方法
+				List<Map<String,Object>> methodIdList = assetMapper.getCalcMethod(assetVO.getOrgName());
+				if(methodIdList!=null&&methodIdList.size()>0){
+					item.setCalcMethod(methodIdList.get(0).get("kind_code").toString());
+				}
+				else{
+					errorList.add(item);
+					errMsg.add("第-"+num+ "-行数据,折旧方法不存在！");
+				}
+				//固定资产科目
+				if(assetVO.getAssetSubjectName()!=null){
+					List<Map<String,Object>> subjectIdList = assetMapper.getSubject(assetVO.getAssetSubjectName(),ownCpId);
+					if(subjectIdList!=null&&subjectIdList.size()>0){
+						item.setAssetSubjectId(subjectIdList.get(0).get("subject_id").toString());
+					}
+					else{
+						errorList.add(item);
+						errMsg.add("第-"+num+ "-行数据,固定资产科目不存在！");
+					}
+				}
+				//累计折旧科目
+				if(assetVO.getCalcSubjectName()!=null){
+					List<Map<String,Object>> subjectIdList = assetMapper.getSubject(assetVO.getCalcSubjectName(),ownCpId);
+					if(subjectIdList!=null&&subjectIdList.size()>0){
+						item.setCalcSubjectId(subjectIdList.get(0).get("subject_id").toString());
+					}
+					else{
+						errorList.add(item);
+						errMsg.add("第-"+num+ "-行数据,累计折旧科目不存在！");
+					}
+				}
+				//资产减值科目
 
 				assetVOList.add(item);
 			}