|
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DatePattern;
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.deepoove.poi.XWPFTemplate;
|
|
import com.deepoove.poi.XWPFTemplate;
|
|
@@ -321,6 +322,25 @@ public class WmPayOffController {
|
|
return R.ok(outputPage);
|
|
return R.ok(outputPage);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @GetMapping("/list-financial-review")
|
|
|
|
+ public R<?> listFinancialReview(String realName, SubjectLocation subjectLocation) {
|
|
|
|
+ Integer deptId = SecurityUtils.getUser().getDeptId();
|
|
|
|
+ // 本企业数据和其他(MAH结算数据)都要
|
|
|
|
+ // 本企业数据 SendPackageDeptId=当前企业id
|
|
|
|
+ // 其他数据 MahSettleDeptId=当期企业,且MahSettleStep=FINANCE
|
|
|
|
+ LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
|
+ .and(wrapper -> wrapper.eq(WmScorePackage::getMahSettleDeptId, deptId)
|
|
|
|
+ .eq(WmScorePackage::getMahSettleStep, UpmsType.MahSettleStep.FINANCE)
|
|
|
|
+ .or(wrapper2 -> wrapper2.eq(WmScorePackage::getSendPackageDeptId, deptId)));
|
|
|
|
+ queryWrapper.eq(WmScorePackage::getPackageFinishStatus, PackageFinishStatusEnum.COMPLETED.val());
|
|
|
|
+ queryWrapper.in(WmScorePackage::getTypeid, "4", "5");
|
|
|
|
+ queryWrapper.eq(WmScorePackage::getSettleFlag, "1");
|
|
|
|
+ List<WmScorePackage> packageList = wmScorePackageService.list(queryWrapper);
|
|
|
|
+
|
|
|
|
+ // TODO
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 结算包结算导出
|
|
* 结算包结算导出
|
|
*
|
|
*
|