|
@@ -22,6 +22,8 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
|
|
import cn.ezhizao.framework.web.page.TableDataInfo;
|
|
import cn.ezhizao.framework.web.page.TableDataInfo;
|
|
import cn.ezhizao.project.business.domain.*;
|
|
import cn.ezhizao.project.business.domain.*;
|
|
import cn.ezhizao.project.business.service.*;
|
|
import cn.ezhizao.project.business.service.*;
|
|
|
|
+import cn.ezhizao.project.system.domain.SysDept;
|
|
|
|
+import cn.ezhizao.project.system.service.ISysDeptService;
|
|
import cn.hutool.core.date.DateTime;
|
|
import cn.hutool.core.date.DateTime;
|
|
import cn.hutool.extra.template.TemplateException;
|
|
import cn.hutool.extra.template.TemplateException;
|
|
import freemarker.template.Template;
|
|
import freemarker.template.Template;
|
|
@@ -66,6 +68,10 @@ public class BizCertificateController extends BaseController
|
|
private IBizPackageResourceGroupService bizPackageResourceGroupService;
|
|
private IBizPackageResourceGroupService bizPackageResourceGroupService;
|
|
@Resource
|
|
@Resource
|
|
private IBizCertificateLotService bizCertificateLotService;
|
|
private IBizCertificateLotService bizCertificateLotService;
|
|
|
|
+ @Resource
|
|
|
|
+ private IBizCompanyProductPackageService bizCompanyProductPackageService;
|
|
|
|
+ @Resource
|
|
|
|
+ private ISysDeptService sysDeptService;
|
|
/**
|
|
/**
|
|
* 生成pdf
|
|
* 生成pdf
|
|
*/
|
|
*/
|
|
@@ -355,6 +361,24 @@ public class BizCertificateController extends BaseController
|
|
certificate.setTenantId(getLoginUser().getTenantId());
|
|
certificate.setTenantId(getLoginUser().getTenantId());
|
|
certificate.setPrintDate(new Date());
|
|
certificate.setPrintDate(new Date());
|
|
certificate.setFactoryName("德迈仕");
|
|
certificate.setFactoryName("德迈仕");
|
|
|
|
+ BizPackageResourceGroup bizPackageResourceGroup = bizPackageResourceGroupService.getById(bizDaywork.getPackageResourceGroupId());
|
|
|
|
+ SysDept dept = sysDeptService.selectDeptById(bizPackageResourceGroup.getDeptId());
|
|
|
|
+ certificate.setDeptName(dept.getDeptName());
|
|
|
|
+ certificate.setDeptId(bizPackageResourceGroup.getDeptId());
|
|
|
|
+ certificate.setPackageLineNo(bizPackageResourceGroup.getPackageLineNo().toString());
|
|
|
|
+ certificate.setPackageResourceGroupId(bizPackageResourceGroup.getId());
|
|
|
|
+ certificate.setPackageResourceGroupName(bizPackageResourceGroup.getName());
|
|
|
|
+ certificate.setYear(bizPackageResourceGroup.getYear());
|
|
|
|
+ BizCompanyProductPackage packageConditions = new BizCompanyProductPackage();
|
|
|
|
+ packageConditions.setProductId(certificate.getProductId());
|
|
|
|
+ packageConditions.setCompanyId(certificate.getCompanyId());
|
|
|
|
+ List<BizCompanyProductPackage> bizCompanyProductPackages = bizCompanyProductPackageService.getList(packageConditions);
|
|
|
|
+ if (bizCompanyProductPackages.size() == 1) {
|
|
|
|
+ certificate.setPackageCode(bizCompanyProductPackages.get(0).getPackageCode());
|
|
|
|
+ certificate.setPackageStandard(bizCompanyProductPackages.get(0).getPackageStandard());
|
|
|
|
+ certificate.setPackageId(bizCompanyProductPackages.get(0).getAccessoriesId());
|
|
|
|
+ certificate.setPackageTypeCode(bizCompanyProductPackages.get(0).getPackageTypeCode());
|
|
|
|
+ }
|
|
return success(certificate);
|
|
return success(certificate);
|
|
}
|
|
}
|
|
|
|
|