费用导入修复2025/08/15

chengf

2025-08-15 1ac555ce49a45e2c7fc015dbb16b104840788c21

 service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java

@@ -7,6 +7,7 @@
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.store.IContractPartyaInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -34,6 +35,7 @@

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;


//    @Override
//    public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {
@@ -86,9 +88,6 @@
            if((os[0] == null && os[2] == null && os[1] == null)){
                break;
            }
            if (os == null ||(os[0] == null && os[1] == null)|| (os[0] == null && os[2] == null)) {
                throw new IllegalArgumentException("请选择费用主体+车牌号或费用主体+合同编号");
            }
            String startTime = handleExcelDateString(os[5].toString());
            String endTime = handleExcelDateString(os[6].toString());
            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY/MM/DD 文本格式");
@@ -96,14 +95,20 @@


            importRoomFee = new ImportRoomFee();
            importRoomFee.setPayerObjName(os[0] == null || (os[0] != null && os[1] != null)?os[1].toString():os[0].toString());
            importRoomFee.setObjType(os[0] == null || (os[0] != null && os[1] != null) ? "6666" : "3333");
            if(!(os[0] == null && os[1] == null)){
                importRoomFee.setPayerObjName(os[0] == null || (os[0] != null && os[1] != null)?os[1].toString():os[0].toString());
                importRoomFee.setObjType(os[0] == null || (os[0] != null && os[1] != null) ? "6666" : "3333");
                importRoomFee.setExpenseSubject(os[0] == null || (os[0] != null && os[1] != null)?os[1].toString():os[0].toString());
            }else{
                importRoomFee.setPayerObjName(os[2] == null?null:os[2].toString());
                importRoomFee.setObjType(os[2] == null?null:os[2].toString());
                importRoomFee.setExpenseSubject(os[2] == null?null:os[2].toString());
            }
            importRoomFee.setIsContractFee(os[0] != null && os[1] ==null && os[2] != null ? "O" : null);
            importRoomFee.setObjType(os[0] != null && os[1] ==null && os[2] != null ? "7777" : null);
            importRoomFee.setObjType(os[2] != null ? "7777" : null);
            importRoomFee.setContractId(os[0] != null && os[1] ==null && os[2] != null ? os[2].toString() : null);
            importRoomFee.setFeeTypeCd(os[3] == null ? null : os[3].toString());
            importRoomFee.setFeeName(os[4] == null ? null : os[4].toString());
            importRoomFee.setExpenseSubject(os[0] == null || (os[0] != null && os[1] != null)?os[1].toString():os[0].toString());
            if(startTime != null){
                importRoomFee.setStartTime(startTime);
            }