Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

周计划预览

Browse Source
This commit is contained in:
paidaxing444
2020-08-31 15:29:17 +08:00
parent 1247162886
commit 43a31a538f
12 changed files with 394 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeController.java
View File

@ -103,4 +103,23 @@ public class ByThemeController extends BaseController {
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(byThemeService.deleteByThemeByIds(ids));
}
/**
* 查询主题整合活动列表
*/
@PostMapping("/listthemebyid/{ids}")
public TableDataInfo listbythemeid(@PathVariable Long[] ids) {
List<ByTheme> list = byThemeService.selectByThemeByIds(ids);
return getDataTable(list);
}
/**
* 查询主题整合活动列表
*/
@PostMapping("/listthemebyactivityid/{ids}")
public TableDataInfo listthemebyactivityid(@PathVariable Long[] ids) {
List<ByTheme> list = byThemeService.selectByThemeByActivityIds(ids);
return getDataTable(list);
}
}

11
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java
View File

@ -14,6 +14,7 @@ import com.ruoyi.project.benyi.service.IByThemeMonthplanitemService;
import com.ruoyi.project.benyi.service.IByThemeWeekplanitemService;
import com.ruoyi.project.common.SchoolCommon;
import com.ruoyi.project.system.service.IByClassService;
import com.ruoyi.project.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -54,6 +55,9 @@ public class ByThemeWeekplanController extends BaseController {
private IByThemeMonthplanitemService byThemeonthplanitemService;
@Autowired
private IByThemeWeekplanitemService byThemeWeekplanitemService;
@Autowired
private ISysUserService userService;
/**
* 查询主题整合周计划（根据月计划明细）列表
@ -93,7 +97,12 @@ public class ByThemeWeekplanController extends BaseController {
@PreAuthorize("@ss.hasPermi('benyi:themeweekplan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(byThemeWeekplanService.selectByThemeWeekplanById(id));
AjaxResult ajax=AjaxResult.success();
ByThemeWeekplan byThemeWeekplan=byThemeWeekplanService.selectByThemeWeekplanById(id);
ajax.put(AjaxResult.DATA_TAG, byThemeWeekplan);
ajax.put("classname",byClassService.selectByClassById(byThemeWeekplan.getClassid()).getBjmc());
ajax.put("createusername",userService.selectUserById(byThemeWeekplan.getCreateuserid()).getNickName());
return ajax;
}
/**

16
ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeMapper.java
View File

@ -66,4 +66,20 @@ public interface ByThemeMapper {
* @return 结果
*/
public int deleteByThemeByIds(Long[] ids);
/**
* 查询主题整合列表
*
* @param ids 主题整合
* @return 主题整合集合
*/
public List<ByTheme> selectByThemeByIds(Long[] ids);
/**
* 查询主题整合列表
*
* @param ids 主题整合
* @return 主题整合集合
*/
public List<ByTheme> selectByThemeByActivityIds(Long[] ids);
}

16
ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeService.java
View File

@ -83,4 +83,20 @@ public interface IByThemeService {
* @return 结果
*/
public int deleteByThemeById(Long id);
/**
* 查询主题整合列表
*
* @param ids 主题整合
* @return 主题整合集合
*/
public List<ByTheme> selectByThemeByIds(Long[] ids);
/**
* 查询主题整合列表
*
* @param ids 主题整合
* @return 主题整合集合
*/
public List<ByTheme> selectByThemeByActivityIds(Long[] ids);
}

22
ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeServiceImpl.java
View File

@ -185,4 +185,26 @@ public class ByThemeServiceImpl implements IByThemeService {
public int deleteByThemeById(Long id) {
return byThemeMapper.deleteByThemeById(id);
}
/**
* 查询主题整合列表
*
* @param ids 主题整合
* @return 主题整合集合selectByThemeByIds
*/
@Override
public List<ByTheme> selectByThemeByIds(Long[] ids) {
return byThemeMapper.selectByThemeByIds(ids);
}
/**
* 查询主题整合列表
*
* @param ids 主题整合
* @return 主题整合集合
*/
@Override
public List<ByTheme> selectByThemeByActivityIds(Long[] ids) {
return byThemeMapper.selectByThemeByActivityIds(ids);
}
}

19
ruoyi/src/main/resources/mybatis/benyi/ByThemeMapper.xml
View File

@ -92,11 +92,28 @@
delete from by_theme where id = #{id}
</delete>
<delete id="deleteByThemeByIds" parameterType="String">
<delete id="deleteByThemeByIds" parameterType="Long">
delete from by_theme where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectByThemeByIds" parameterType="Long" resultMap="ByThemeResult">
<include refid="selectByThemeVo"/>
where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</select>
<select id="selectByThemeByActivityIds" parameterType="Long" resultMap="ByThemeResult">
select * from by_theme where id in (
select themeid from by_theme_activity where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
)
</select>
</mapper>