submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecTemplateServiceImpl.java

@@ -101,7 +101,7 @@ public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateM
                             priceVo.setSpecAttrIds(x.getSpecAttributeIds());
                             priceVo.setSpecialGoods(0);
                             CourseEducationType educationType = courseEducationTypeService.getById(goods.getEducationTypeId());
-                            priceVo.setEducationTypeName(educationType.getEducationName());
+                            priceVo.setEducationName(educationType.getEducationName());
                             CourseProjectType projectType = courseProjectTypeService.getById(goods.getProjectId());
                             priceVo.setProjectName(projectType.getProjectName());
                             CourseBusiness business = courseBusinessService.getById(goods.getBusinessId());
@@ -109,12 +109,16 @@ public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateM
                             if (ObjectUtils.isNotNull(business.getTemplateStatus()) && business.getTemplateStatus() == 1){
                                 priceVo.setTemplateType("class");
                             }
+                            priceVo.setErJianErZao(false);
+                            priceVo.setJjShiGongYuan(false);
                             //商品业务类型
                             String businessName = goodsService.getGoodsBusinessName(x.getGoodsId());
-                            if (businessName.contains("继续教育二级建造师")){
+                            if (businessName.contains("继续教育二级建造师") || businessName.equals("继续教育二级造价师")){
                                 priceVo.setSpecialGoods(1);
+                                priceVo.setErJianErZao(true);
                             }else if (businessName.contains("继续教育") && businessName.contains("施工现场专业人员")){
                                 vo.setSign(1);
+                                priceVo.setJjShiGongYuan(true);
                             }
                             return priceVo;
                         }).collect(Collectors.toList());

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/SpecAttrPriceVo.java

@@ -145,6 +145,10 @@ public class SpecAttrPriceVo implements Serializable {
     private Integer specialGoods;
     /** 模版类型 */
     private String templateType;
+    @ApiModelProperty("是否是继教施工员")
+    private Boolean jjShiGongYuan;
+    @ApiModelProperty("是否是二建二造")
+    private Boolean erJianErZao;
 
 
 }