jiekowanshan

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityAdvertisingController.java

@@ -81,8 +81,10 @@ public class ActivityAdvertisingController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:advertising:add')")
     @Log(title = "广告发布储存", businessType = BusinessType.INSERT)
     @PostMapping("addActivity")
-    public AjaxResult<Void> add(@RequestBody ActivityAdvertisingAddBo bo) {
-        return toAjax(iActivityAdvertisingService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult add(@RequestBody ActivityAdvertisingAddBo bo) {
+        long l = iActivityAdvertisingService.insertByAddBo(bo);
+        String content = "";
+        return AjaxResult.success_log(l,content);
     }
 
     /**

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamArrangementController.java

@@ -57,7 +57,7 @@ public class ExamArrangementController extends BaseController {
     /**
      * 导出考试安排，包含考试指引列表
      */
-    @ApiOperation("导出考试安排，包含考试指引列表")
+ /*   @ApiOperation("导出考试安排，包含考试指引列表")
     @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:export')")
     @Log(title = "考试安排，包含考试指引", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -65,7 +65,7 @@ public class ExamArrangementController extends BaseController {
         List<ExamArrangementVo> list = iExamArrangementService.queryList(bo);
         ExcelUtil<ExamArrangementVo> util = new ExcelUtil<ExamArrangementVo>(ExamArrangementVo.class);
         return util.exportExcel(list, "考试安排，包含考试指引");
-    }
+    }*/
 
     /**
      * 获取考试安排，包含考试指引详细信息
@@ -83,7 +83,7 @@ public class ExamArrangementController extends BaseController {
     @ApiOperation("新增考试安排，包含考试指引")
     @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:add')")
     @Log(title = "考试安排，包含考试指引", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/addExam")
     public AjaxResult<Void> add(@RequestBody ExamArrangementAddBo bo) {
         return toAjax(iExamArrangementService.insertByAddBo(bo) ? 1 : 0);
     }
@@ -94,7 +94,7 @@ public class ExamArrangementController extends BaseController {
     @ApiOperation("修改考试安排，包含考试指引")
     @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:edit')")
     @Log(title = "考试安排，包含考试指引", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/editExam")
     public AjaxResult<Void> edit(@RequestBody ExamArrangementEditBo bo) {
         return toAjax(iExamArrangementService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -105,7 +105,7 @@ public class ExamArrangementController extends BaseController {
     @ApiOperation("删除考试安排，包含考试指引")
     @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:remove')")
     @Log(title = "考试安排，包含考试指引" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @PostMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iExamArrangementService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityAdvertisingService.java

@@ -34,7 +34,7 @@ public interface IActivityAdvertisingService extends IService<ActivityAdvertisin
 	 * @param bo 广告发布储存新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(ActivityAdvertisingAddBo bo);
+	long insertByAddBo(ActivityAdvertisingAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改广告发布储存

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -73,12 +73,12 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
     }
 
     @Override
-    public Boolean insertByAddBo(ActivityAdvertisingAddBo bo) {
+    public long insertByAddBo(ActivityAdvertisingAddBo bo) {
         ActivityAdvertising add = BeanUtil.toBean(bo, ActivityAdvertising.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        return this.save(add)?add.getId():0;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementAddBo.java

@@ -41,7 +41,7 @@ public class ExamArrangementAddBo {
     private String remarks;
     /** 0手动发布  3定时发布 4已结束 */
     @ApiModelProperty("0手动发布  3定时发布 4已结束")
-    private Integer release;
+    private Integer releaseNum;
     /** 订阅人数 */
     @ApiModelProperty("订阅人数")
     private Integer subscrPe;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementEditBo.java

@@ -52,7 +52,7 @@ public class ExamArrangementEditBo {
 
     /** 0手动发布  3定时发布 4已结束 */
     @ApiModelProperty("0手动发布  3定时发布 4已结束")
-    private Integer release;
+    private Integer releaseNum;
 
     /** 订阅人数 */
     @ApiModelProperty("订阅人数")

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementQueryBo.java

@@ -59,7 +59,7 @@ public class ExamArrangementQueryBo extends BaseEntity {
 	private String remarks;
 	/** 0手动发布  3定时发布 4已结束 */
 	@ApiModelProperty("0手动发布  3定时发布 4已结束")
-	private Integer release;
+	private Integer releaseNum;
 	/** 订阅人数 */
 	@ApiModelProperty("订阅人数")
 	private Integer subscrPe;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangement.java

@@ -50,7 +50,7 @@ private static final long serialVersionUID=1L;
     private String remarks;
 
     /** 0手动发布  3定时发布 4已结束 */
-    private Integer release;
+    private Integer releaseNum;
 
     /** 订阅人数 */
     private Integer subscrPe;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementServiceImpl.java

@@ -56,7 +56,7 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
         lqw.eq(StrUtil.isNotBlank(bo.getExamAdress()), ExamArrangement::getExamAdress, bo.getExamAdress());
         lqw.eq(StrUtil.isNotBlank(bo.getExamUrl()), ExamArrangement::getExamUrl, bo.getExamUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ExamArrangement::getRemarks, bo.getRemarks());
-        lqw.eq(bo.getRelease() != null, ExamArrangement::getRelease, bo.getRelease());
+        lqw.eq(bo.getReleaseNum() != null, ExamArrangement::getReleaseNum, "'"+bo.getReleaseNum()+"'");
         lqw.eq(bo.getSubscrPe() != null, ExamArrangement::getSubscrPe, bo.getSubscrPe());
         lqw.eq(bo.getSignUpPe() != null, ExamArrangement::getSignUpPe, bo.getSignUpPe());
         lqw.eq(bo.getReleaseTime() != null, ExamArrangement::getReleaseTime, bo.getReleaseTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamArrangementVo.java

@@ -51,7 +51,7 @@ public class ExamArrangementVo {
 	/** 备注 */
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")
-	private String remarks;
+	private String releaseNum;
 	/** 0手动发布  3定时发布 4已结束 */
 	@Excel(name = "0手动发布  3定时发布 4已结束")
 	@ApiModelProperty("0手动发布  3定时发布 4已结束")