MERGE

run-prod.sh

@@ -1,3 +1,5 @@
+
+
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhongzheng'
@@ -33,5 +35,7 @@ docker run \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
 
-
-
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderBusinessConfigController.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import com.zhongzheng.modules.order.bo.OrderBusinessConfigAddBo;
 import com.zhongzheng.modules.order.bo.OrderBusinessConfigEditBo;
 import com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo;
+import com.zhongzheng.modules.order.domain.OrderBusinessConfig;
 import com.zhongzheng.modules.order.service.IOrderBusinessConfigService;
 import com.zhongzheng.modules.order.vo.OrderBusinessConfigVo;
 import lombok.RequiredArgsConstructor;
@@ -90,6 +91,14 @@ public class OrderBusinessConfigController extends BaseController {
         return toAjax(iOrderBusinessConfigService.insertByAddBo(bo) ? 1 : 0);
     }
 
+    @ApiOperation("新增录单配置")
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "录单配置", businessType = BusinessType.INSERT)
+    @PostMapping("/withEntity")
+    public AjaxResult<OrderBusinessConfig> addWithEntity(@RequestBody OrderBusinessConfigAddBo bo) {
+        return AjaxResult.success(iOrderBusinessConfigService.insertByAddBoWithEntity(bo));
+    }
+
     /**
      * 修改录单配置
      */

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

@@ -39,6 +39,8 @@ public interface IOrderBusinessConfigService extends IService<OrderBusinessConfi
 	 */
 	Boolean insertByAddBo(OrderBusinessConfigAddBo bo);
 
+	OrderBusinessConfig insertByAddBoWithEntity(OrderBusinessConfigAddBo bo);
+
 	/**
 	 * 根据编辑业务对象修改录单配置
 	 * @param bo 录单配置编辑业务对象

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

@@ -95,6 +95,16 @@ public class OrderBusinessConfigServiceImpl extends ServiceImpl<OrderBusinessCon
         return this.save(add);
     }
 
+    @Override
+    public OrderBusinessConfig insertByAddBoWithEntity(OrderBusinessConfigAddBo bo) {
+        OrderBusinessConfig add = BeanUtil.toBean(bo, OrderBusinessConfig.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        this.save(add);
+        return add;
+    }
+
     @Override
     public Boolean updateByEditBo(OrderBusinessConfigEditBo bo) {
         OrderBusinessConfig update = BeanUtil.toBean(bo, OrderBusinessConfig.class);

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -565,6 +565,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_education_type cet ON cpt.education_id = cet.id
         WHERE
             m.category_name = #{majorName}
+          AND m.`status` = 1
           AND INSTR( '施工现场专业人员', cpt.project_name ) > 0
           AND INSTR( '考前培训', cet.education_name ) > 0
     </select>