merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -77,7 +77,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     List<ClassGrade> queryListByNameTenantId(@Param("className") String className,@Param("tenantId") Long tenantId);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<ClassGrade> getGradeListByCodeTenant(@Param("registerCode") String registerCode);
+    List<ClassGrade> getGradeListByCodeTenant(@Param("officialName") String officialName);
 
     @InterceptorIgnore(tenantLine = "true")
     void UpGradeStatusByTenant(ClassGradeOpenUpBo openUpBo);
@@ -107,5 +107,5 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     void updateByIdNoTenant(ClassGrade update);
 
     @InterceptorIgnore(tenantLine = "true")
-    ClassGrade getCodeNoTenant(@Param("registerCode") String registerCode,@Param("tenantId") Long tenantId);
+    ClassGrade getCodeNoTenant(@Param("officialName") String officialName,@Param("tenantId") Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -110,7 +110,7 @@ public interface IClassGradeService extends IService<ClassGrade> {
 
     List<ClassGrade> listByIdsNoTenant(List<Long> ids);
 
-    ClassGrade getCodeNoTenant(String registerCode, Long tenantId);
+    ClassGrade getCodeNoTenant(String officialName, Long tenantId);
 
 	void openOfficialSaveGrade(ClassGradeOpenBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -313,7 +313,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             }else if (("继续教育二级建造师".equals(businessName)) || ("继续教育二级造价师".equals(businessName))){
                 erJfalg = true;
                 ezJfalg = "继续教育二级造价师".equals(businessName);
-                add.setRegisterCode(ServletUtils.getEncoded("PIY"));
+                add.setOfficialName(ServletUtils.getEncoded("PIY"));
             }
         }
         //是否创建官方班级编号
@@ -416,6 +416,32 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 //            }
 //        }
         boolean save = this.save(add);
+
+        //添加班级商品
+        if (bo.getClassGradeGoodsAddBos() != null) {
+            for (Long classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {
+                ClassGradeGoods classGradeGoods = new ClassGradeGoods();
+                classGradeGoods.setGradeId(add.getGradeId());
+                classGradeGoods.setGoodsId(classGradeGoodsAddBo);
+                classGradeGoods.setCreateTime(DateUtils.getNowTime());
+                classGradeGoods.setUpdateTime(DateUtils.getNowTime());
+                classGradeGoodsService.save(classGradeGoods);
+            }
+        }
+        //记录班主任
+        if (bo.getSysUserId() != null) {
+            ClassGradeSys classGradeSys = new ClassGradeSys();
+            classGradeSys.setGradeId(add.getGradeId());
+            classGradeSys.setCreateBy(SecurityUtils.getUsername());
+            classGradeSys.setStartTime(DateUtils.getNowTime());
+            classGradeSys.setSysUserId(bo.getSysUserId());
+            classGradeSys.setStatus(1);
+
+            classGradeSys.setCreateTime(DateUtils.getNowTime());
+            classGradeSys.setUpdateTime(DateUtils.getNowTime());
+            classGradeSysService.save(classGradeSys);
+        }
+
         if (erJfalg && bo.getClassGradeGoodsAddBos() != null){
             //二建继教班级创建，所有共享班级机构同步创建
             synchronousCreation(add,sysTenant,bo.getClassGradeGoodsAddBos()[0]);
@@ -427,12 +453,16 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 classBo.setBeginTime(DateUtils.timestampToDateFormat(add.getClassStartTime(),"yyyy-MM-dd HH:mm:ss"));
                 classBo.setEndTime(DateUtils.timestampToDateFormat(add.getClassEndTime(),"yyyy-MM-dd HH:mm:ss"));
             }else {
-                classBo.setClassNo(add.getRegisterCode());
+                classBo.setClassNo(add.getOfficialName());
                 classBo.setOpenclassState(0);
             }
             classBo.setCategoryName(add.getClassName());
             classBo.setPlatformId(ezJfalg?8:5);
-
+            Goods goods = iGoodsService.getById(bo.getClassGradeGoodsAddBos()[0]);
+            Major major = iMajorService.getById(goods.getMajorId());
+            if (ObjectUtils.isNotNull(major)){
+                classBo.setMajorName(major.getCategoryName());
+            }
             Long nowTime = DateUtils.getNowTime();
             String sign = ToolsUtils.EncoderByMd5(classBo.getClassNo()+nowTime.toString() + "pubilc2022");
             classBo.setSign(sign);
@@ -448,30 +478,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 throw new CustomException("旧系统创建班级错误" + e.getMessage());
             }
         }
-        //添加班级商品
-        if (bo.getClassGradeGoodsAddBos() != null) {
-            for (Long classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {
-                ClassGradeGoods classGradeGoods = new ClassGradeGoods();
-                classGradeGoods.setGradeId(add.getGradeId());
-                classGradeGoods.setGoodsId(classGradeGoodsAddBo);
-                classGradeGoods.setCreateTime(DateUtils.getNowTime());
-                classGradeGoods.setUpdateTime(DateUtils.getNowTime());
-                classGradeGoodsService.save(classGradeGoods);
-            }
-        }
-        //记录班主任
-        if (bo.getSysUserId() != null) {
-            ClassGradeSys classGradeSys = new ClassGradeSys();
-            classGradeSys.setGradeId(add.getGradeId());
-            classGradeSys.setCreateBy(SecurityUtils.getUsername());
-            classGradeSys.setStartTime(DateUtils.getNowTime());
-            classGradeSys.setSysUserId(bo.getSysUserId());
-            classGradeSys.setStatus(1);
-
-            classGradeSys.setCreateTime(DateUtils.getNowTime());
-            classGradeSys.setUpdateTime(DateUtils.getNowTime());
-            classGradeSysService.save(classGradeSys);
-        }
 
         return save;
     }
@@ -496,7 +502,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 return;
             }
             //班级是否存在
-            ClassGrade grade = baseMapper.getCodeNoTenant(classGrade.getRegisterCode(),tenant.getTenantId());
+            ClassGrade grade = baseMapper.getCodeNoTenant(classGrade.getOfficialName(),tenant.getTenantId());
             if (ObjectUtils.isNotNull(grade)){
                 //已经存在 不创建
                 return;
@@ -557,6 +563,8 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         if (ObjectUtils.isNull(gradeGoods)) {
             throw new RuntimeException("班级商品信息查询失败");
         }
+        ClassGrade classGrade = getById(update.getGradeId());
+        String officialName = classGrade.getOfficialName();//预开班班级编号
         //企业ID
         String tenant = ServletUtils.getRequest().getHeader("TenantId");
         SysOldOrg org = sysOldOrgService.list(new LambdaQueryWrapper<SysOldOrg>()
@@ -690,8 +698,8 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         if ((("继续教育二级建造师".equals(fullName)) || ("继续教育二级造价师".equals(fullName))) && org.getShareClass() == 1) {
             if (ObjectUtils.isNotNull(grade) && ObjectUtils.isNotNull(grade.getClassStatus()) && grade.getClassStatus() == 1) {
                 ClassGradeOpenBo openBo = new ClassGradeOpenBo();
+                openBo.setRegisterCode(officialName);
                 openBo.setOfficialName(grade.getOfficialName());
-                openBo.setRegisterCode(grade.getRegisterCode());
                 openBo.setClassName(grade.getClassName());
                 openBo.setClassStartTime(grade.getClassStartTime());
                 openBo.setClassEndTime(grade.getClassEndTime());
@@ -707,6 +715,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 JSONObject param = JSONObject.parseObject(JSONObject.toJSONString(openBo));
                 String respone = "";
                 try {
+                    System.out.println("param = " + param);
                     respone = HttpUtils.sendPost(CLASS_OPEN_PATH, param);
                     log.info("查询旧系统班级开班接口结果" + respone, "");
                     if (!respone.contains("\"Status\":true")) {

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

@@ -2487,7 +2487,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if ((("继续教育二级建造师".equals(fullName)) || ("继续教育二级造价师".equals(fullName))) && org.getShareClass() == 1) {
                 //生成预开班编号
 //                classGrade.setOfficialName(createGradeCode(goodsId, businessVo));
-                classGrade.setRegisterCode(ServletUtils.getEncoded("PIY"));
+                classGrade.setOfficialName(ServletUtils.getEncoded("PIY"));
             }
 
         } else {
@@ -2563,6 +2563,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
 
         boolean save = iClassGradeService.save(classGrade);
+        //绑定班级商品
+        ClassGradeGoods classGradeGoods = new ClassGradeGoods();
+        classGradeGoods.setGradeId(classGrade.getGradeId());
+        classGradeGoods.setGoodsId(goodsId);
+        classGradeGoods.setCreateTime(DateUtils.getNowTime());
+        classGradeGoods.setUpdateTime(DateUtils.getNowTime());
+        iClassGradeGoodsService.save(classGradeGoods);
+        //锁定班级
+        lockGrade(orderGoodsId, classGrade.getGradeId(), userId, goodsId, orderSn,orderGoods.getSevenYear());
         if ((("继续教育二级建造师".equals(businessFull)) || ("继续教育二级造价师".equals(businessFull))) && sysTenant.getShareClass() == 1) {
             //二建继教班级创建，所有共享班级机构同步创建
             synchronousCreation(classGrade,sysTenant,goodsId);
@@ -2574,11 +2583,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 classBo.setBeginTime(DateUtils.timestampToDateFormat(classGrade.getClassStartTime(),"yyyy-MM-dd HH:mm:ss"));
                 classBo.setEndTime(DateUtils.timestampToDateFormat(classGrade.getClassEndTime(),"yyyy-MM-dd HH:mm:ss"));
             }else {
-                classBo.setClassNo(classGrade.getRegisterCode());
+                classBo.setClassNo(classGrade.getOfficialName());
                 classBo.setOpenclassState(0);
             }
             classBo.setCategoryName(classGrade.getClassName());
             classBo.setPlatformId("继续教育二级造价师".equals(businessFull)?8:5);
+            Major major = iMajorService.getById(goods.getMajorId());
+            if (ObjectUtils.isNotNull(major)){
+                classBo.setMajorName(major.getCategoryName());
+            }
 
             Long nowTime = DateUtils.getNowTime();
             String sign = ToolsUtils.EncoderByMd5(classBo.getClassNo()+nowTime.toString() + "pubilc2022");
@@ -2596,15 +2609,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 log.error("旧系统创建班级错误" + respone);
             }
         }
-        //绑定班级商品
-        ClassGradeGoods classGradeGoods = new ClassGradeGoods();
-        classGradeGoods.setGradeId(classGrade.getGradeId());
-        classGradeGoods.setGoodsId(goodsId);
-        classGradeGoods.setCreateTime(DateUtils.getNowTime());
-        classGradeGoods.setUpdateTime(DateUtils.getNowTime());
-        iClassGradeGoodsService.save(classGradeGoods);
-        //锁定班级
-        lockGrade(orderGoodsId, classGrade.getGradeId(), userId, goodsId, orderSn,orderGoods.getSevenYear());
         return true;
     }
 
@@ -2623,7 +2627,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 return;
             }
             //班级是否存在
-            ClassGrade grade = iClassGradeService.getCodeNoTenant(classGrade.getRegisterCode(),tenant.getTenantId());
+            ClassGrade grade = iClassGradeService.getCodeNoTenant(classGrade.getOfficialName(),tenant.getTenantId());
             if (ObjectUtils.isNotNull(grade)){
                 //已经存在 不创建
                 return;

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -1066,8 +1066,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cg.*
         FROM
             class_grade cg
-        where cg.official_name = #{registerCode}
-          AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cg.tenant_id AND sog.share_class = 1) > 0
+        where cg.official_name = #{officialName}
+          AND (SELECT COUNT(*) FROM sys_tenant s WHERE s.tenant_id = cg.tenant_id AND s.share_class = 1) > 0
     </select>
 
     <update id="UpGradeStatusByTenant" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeOpenUpBo" >
@@ -1341,7 +1341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             class_grade
         WHERE
             `status` = 1
-            AND register_code = #{registerCode}
+            AND official_name = #{officialName}
             AND tenant_id = #{tenantId}
             LIMIT 1
     </select>