submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterAddBo.java

@@ -53,4 +53,6 @@ public class CourseChapterAddBo {
     /** 导入编号 */
     @ApiModelProperty("导入编号")
     private String importNo;
+    @ApiModelProperty("公共标识：1公共章 0非公共章")
+    private Integer commonSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterEditBo.java

@@ -64,4 +64,7 @@ public class CourseChapterEditBo {
     /** 导入编号 */
     @ApiModelProperty("导入编号")
     private String importNo;
+
+    @ApiModelProperty("公共标识：1公共章 0非公共章")
+    private Integer commonSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java

@@ -52,5 +52,7 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private Long oId;
+    /** 公共标识：1公共章 0非公共章 */
+    private String commonSign;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterVo.java

@@ -81,4 +81,6 @@ public class CourseChapterVo {
 	@Excel(name = "导入编号")
 	@ApiModelProperty("导入编号")
 	private String importNo;
+	@ApiModelProperty("公共标识：1公共章 0非公共章")
+	private Integer commonSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -197,4 +197,7 @@ public class GoodsAddBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
+    /** 七大员继教可选年份 */
+    @ApiModelProperty("七大员继教可选年份")
+    private String sevenYear;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -231,4 +231,7 @@ public class GoodsEditBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
+    /** 七大员继教可选年份 */
+    @ApiModelProperty("七大员继教可选年份")
+    private String sevenYear;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -159,4 +159,6 @@ private static final long serialVersionUID=1L;
     private String commitPeriodRemark;
     /** 班级类型 1基础班 2强化班 3私塾班 */
     private Integer gradeType;
+    /** 七大员继教可选年份 */
+    private String sevenYear;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsMapper.java

@@ -78,4 +78,6 @@ public interface GoodsMapper extends BaseMapper<Goods> {
 
     @InterceptorIgnore(tenantLine = "true")
     void updateHandoutsId(@Param("goodsId") Long goodsId,@Param("tenantId") Long tenantId,@Param("handoutsId") Long handoutsId);
+
+    String getGoodsBusinessName(Long goodsId);
 }

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

@@ -142,4 +142,6 @@ public interface IGoodsService extends IService<Goods> {
 	Goods queryGoodsByIdTenant(Long goodsId, Long tenantId);
 
     boolean goodsHandoutsCopyAddTenant(GoodsHandoutsCopyTenantBo bo);
+
+	String getGoodsBusinessName(Long goodsId);
 }

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

@@ -4961,6 +4961,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return true;
     }
 
+    @Override
+    public String getGoodsBusinessName(Long goodsId) {
+        return baseMapper.getGoodsBusinessName(goodsId);
+    }
+
     private void updateHandoutsId(Long goodsId, Long tenantId, Long handoutsId) {
         baseMapper.updateHandoutsId(goodsId,tenantId,handoutsId);
     }

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

@@ -366,5 +366,7 @@ public class GoodsVo {
 	private Integer gradeType;
 	@ApiModelProperty("官方班级名称")
 	private String officialName;
-
+	/** 七大员继教可选年份 */
+	@ApiModelProperty("七大员继教可选年份")
+	private String sevenYear;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -22,7 +22,8 @@ import com.zhongzheng.common.annotation.Excel;
 @TableName("class_grade")
 public class ClassGrade implements Serializable {
     public static final Integer INIT_UPPER = 300;  //初始人数
-    public static final Integer INIT_UPPER2 = 1000000;  //初始人数
+    public static final Integer INIT_UPPER2 = 100000;  //初始人数
+    public static final Integer INIT_UPPER3 = 1000;  //初始人数
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -87,4 +87,7 @@ public class OrderGoodsAddBo {
     private String distributionCode;
     @ApiModelProperty("分销链编码")
     private String distributionLinkCode;
+    /** 七大员继教商品年份 */
+    @ApiModelProperty("七大员继教商品年份")
+    private String sevenYear;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -94,4 +94,6 @@ private static final long serialVersionUID=1L;
     private Integer divideModel;
     @ApiModelProperty("分成钱")
     private BigDecimal divideMoney;
+    /** 七大员商品年份 */
+    private String sevenYear;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -2064,7 +2064,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (isConfigTp) {
             classGrade.setClassStatus(0);
             classGrade.setLearningStatus(2);//待定
-            classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
+            //七大员继教默认上限1000
+            String businessFullName = iGoodsService.getGoodsBusinessName(goodsId);
+            if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
+                //七大员继教
+                classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
+            }else {
+                classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
+            }
 
             //企业ID
             String tenant = ServletUtils.getRequest().getHeader("TenantId");
@@ -2424,7 +2431,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (isConfigTp) {
             classGrade.setClassStatus(0);
             classGrade.setLearningStatus(2);//待定
-            classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
+            //七大员继教默认上限1000
+            String businessFullName = iGoodsService.getGoodsBusinessName(goodsId);
+            if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
+                //七大员继教
+                classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
+            }else {
+                classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
+            }
         } else {
             classGrade.setLearningStatus(1);//即刻
             classGrade.setStudentUpper(ClassGrade.INIT_UPPER2); //上限1000000

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="importNo" column="import_no"/>
+        <result property="commonSign" column="common_sign"/>
         <collection property="businessList" column="chapter_id" select="findBusinessList"/>
         <collection property="moduleList" column="chapter_id" select="findModuleList"/>
         <collection property="courseList" column="chapter_id" select="findCourseList"/>

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -141,6 +141,7 @@
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="optionalYear" column="optional_year"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -939,4 +940,16 @@
         UPDATE goods SET handouts_id = #{handoutsId} WHERE goods_id = #{goodsId} and tenant_id = #{tenantId}
     </update>
 
+    <select id="getGoodsBusinessName" parameterType="java.lang.Long" resultType="java.lang.String">
+        SELECT
+            CONCAT( cet.education_name, cb.business_name, cpt.project_name )
+        FROM
+            goods g
+                LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+                LEFT JOIN course_business cb ON g.business_id = cb.id
+        WHERE
+            g.goods_id = #{goodsId}
+    </select>
+
 </mapper>