he2802 4 жил өмнө
parent
commit
e13977798e

+ 12 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseBusinessController.java

@@ -99,6 +99,18 @@ public class CourseBusinessController extends BaseController {
         return toAjax(iCourseBusinessService.updateByEditBo(bo) ? 1 : 0);
     }
 
+    /**
+     * 修改业务层次
+     */
+    @ApiOperation("批量更改业务层次得模板")
+    @PreAuthorize("@ss.hasPermi('course:business:edit')")
+    @Log(title = "业务层次", businessType = BusinessType.UPDATE)
+    @PostMapping("/editModel")
+    public AjaxResult<Void> editModel(@RequestBody CourseBusinessEditBo bo) {
+        return toAjax(iCourseBusinessService.editModel(bo) ? 1 : 0);
+    }
+
+
     /**
      * 删除业务层次
      */

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,7 +45,7 @@ public class QuestionChapterQueryBo extends BaseEntity {
 	private Long sort;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 前缀名称 */
 	@ApiModelProperty("前缀名称")
 	private String prefixName;

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionModuleQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,7 +48,7 @@ public class QuestionModuleQueryBo extends BaseEntity {
 	private Long publishStatus;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterServiceImpl.java

@@ -53,7 +53,7 @@ public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMappe
         LambdaQueryWrapper<QuestionChapter> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getName()), QuestionChapter::getName, bo.getName());
         lqw.eq(bo.getSort() != null, QuestionChapter::getSort, bo.getSort());
-        lqw.eq(bo.getStatus() != null, QuestionChapter::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, QuestionChapter::getStatus, bo.getStatus());
         lqw.like(StrUtil.isNotBlank(bo.getPrefixName()), QuestionChapter::getPrefixName, bo.getPrefixName());
         lqw.eq(bo.getPublishStatus() != null, QuestionChapter::getPublishStatus, bo.getPublishStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), QuestionChapter::getCode, bo.getCode());

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionModuleServiceImpl.java

@@ -54,7 +54,7 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
         lqw.like(StrUtil.isNotBlank(bo.getPrefixName()), QuestionModule::getPrefixName, bo.getPrefixName());
         lqw.like(StrUtil.isNotBlank(bo.getModuleName()), QuestionModule::getModuleName, bo.getModuleName());
         lqw.eq(bo.getPublishStatus() != null, QuestionModule::getPublishStatus, bo.getPublishStatus());
-        lqw.eq(bo.getStatus() != null, QuestionModule::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, QuestionModule::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), QuestionModule::getCode, bo.getCode());
         return entity2Vo(this.list(lqw));
     }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessEditBo.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -53,4 +54,8 @@ public class CourseBusinessEditBo {
     @ApiModelProperty("模板选用")
     private Integer templateStatus;
 
+
+    @Excel(name = "批量更改得业务id")
+    @ApiModelProperty("批量更改得业务id")
+    private List<Long> businessIds;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseBusinessService.java

@@ -49,4 +49,6 @@ public interface ICourseBusinessService extends IService<CourseBusiness> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	boolean editModel(CourseBusinessEditBo bo);
 }

+ 13 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -102,4 +102,17 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public boolean editModel(CourseBusinessEditBo bo) {
+        for (Long businessId : bo.getBusinessIds()) {
+            CourseBusiness update =new CourseBusiness();
+            update.setUpdateTime(DateUtils.getNowTime());
+            update.setId(businessId);
+            update.setTemplateStatus(bo.getTemplateStatus());
+            this.updateById(update);
+        }
+
+        return true;
+    }
 }

+ 6 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseBusinessVo.java

@@ -78,7 +78,11 @@ public class CourseBusinessVo {
 	@ApiModelProperty("科目id")
 	private Integer subjectId;
 
-	@Excel(name = "模板选用")
-	@ApiModelProperty("模板选用")
+	@Excel(name = "模板选用ID")
+	@ApiModelProperty("模板选用ID")
 	private Integer templateStatus;
+
+	@Excel(name = "模板选用名称")
+	@ApiModelProperty("模板选用名称")
+	private String templateName;
 }

+ 4 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectName" column="project_name"/>
         <result property="educationId" column="education_id"/>
         <result property="templateStatus" column="template_status"/>
+        <result property="templateName" column="template_name"/>
     </resultMap>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="CourseBusinessVoResult">
@@ -33,11 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.*,
             e.education_name,
             e.id as education_id,
-            p.project_name
+            p.project_name,
+            t.name as template_name
         FROM
             course_business b
                 LEFT JOIN course_project_type p on b.project_id =p.id
                 LEFT JOIN course_education_type e ON p.education_id = e.id
+                LEFT JOIN order_input_template t ON b.template_status = t.id
         where 1=1
         and p.status != -1
         and e.status != -1