public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改大屏接口

This commit is contained in:
liuwu 2023-08-24 14:24:09 +08:00
parent 6a0535e15d
commit d6bef220e7
5 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java
View File

@ -1,6 +1,7 @@
package com.cyx.web.base.controller;
import com.cyx.common.core.controller.BaseController;
import com.cyx.common.core.domain.AjaxResult;
import com.cyx.common.core.domain.entity.SysUser;
import com.cyx.common.core.page.TableDataInfo;
import com.cyx.web.base.domain.TAmentAdvancedDept;
@ -31,6 +32,21 @@ public class BigScreenController extends BaseController {
private ITAmentAdvancedDeptService advancedDeptService;
// @RequiresPermissions("base:user:list")
/**
* 所有统计
* @param am
* @return
*/
@PostMapping("/groupAll")
@ResponseBody
public AjaxResult groupAll(TAmentPartyAffairs am)
{
SysUser u = getSysUser();
am.setDeptId(u.getDeptId());
List<Map<String,Object>> list = partyAffairsService.groupAll(am);
return AjaxResult.success(list);
}
/**
* 党务意识形态
* @param am
@ -38,13 +54,12 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/dwysxt")
@ResponseBody
public TableDataInfo dwysxt(TAmentPartyAffairs am)
public AjaxResult dwysxt(TAmentPartyAffairs am)
{
startPage();
SysUser u = getSysUser();
am.setDeptId(u.getDeptId());
List<Map<String,Object>> list = partyAffairsService.dwysxt(am);
return getDataTable(list);
return AjaxResult.success(list);
}
/**
@ -54,13 +69,12 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/dflzjs")
@ResponseBody
public TableDataInfo dflzjs(TAmentPartyAffairs am)
public AjaxResult dflzjs(TAmentPartyAffairs am)
{
startPage();
SysUser u = getSysUser();
am.setDeptId(u.getDeptId());
List<Map<String,Object>> list = partyAffairsService.dflzjs(am);
return getDataTable(list);
return AjaxResult.success(list);
}
/**
@ -70,13 +84,12 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/rckhzb")
@ResponseBody
public TableDataInfo rckhzb(TAmentPartyAffairs am)
public AjaxResult rckhzb(TAmentPartyAffairs am)
{
startPage();
SysUser u = getSysUser();
am.setDeptId(u.getDeptId());
List<Map<String,Object>> list = partyAffairsService.rckhzb(am);
return getDataTable(list);
return AjaxResult.success(list);
}
/**
@ -86,13 +99,12 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/ndkhbz")
@ResponseBody
public TableDataInfo ndkhbz(TAmentPartyAffairs am)
public AjaxResult ndkhbz(TAmentPartyAffairs am)
{
startPage();
SysUser u = getSysUser();
am.setDeptId(u.getDeptId());
List<Map<String,Object>> list = partyAffairsService.ndkhbz(am);
return getDataTable(list);
return AjaxResult.success(list);
}
/**
@ -102,13 +114,12 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/bmwcqk")
@ResponseBody
public TableDataInfo bmwcqk(TAmentPartyAffairs am)
public AjaxResult bmwcqk(TAmentPartyAffairs am)
{
startPage();
SysUser u = getSysUser();
am.setDeptId(u.getDeptId());
List<Map<String,Object>> list = partyAffairsService.bmwcqk(am);
return getDataTable(list);
return AjaxResult.success(list);
}
/**
@ -118,12 +129,11 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/advanceParity")
@ResponseBody
public TableDataInfo advanceParity(TAmentAdvancedParty pa)
public AjaxResult advanceParity(TAmentAdvancedParty pa)
{
startPage();
SysUser u = getSysUser();
List<Map<String,Object>> list = advancedPartyService.advanceParity(pa);
return getDataTable(list);
return AjaxResult.success(list);
}
/**
@ -133,12 +143,11 @@ public class BigScreenController extends BaseController {
*/
@PostMapping("/advanceDept")
@ResponseBody
public TableDataInfo advanceDept(TAmentAdvancedDept dept)
public AjaxResult advanceDept(TAmentAdvancedDept dept)
{
startPage();
SysUser u = getSysUser();
List<Map<String,Object>> list = advancedDeptService.advanceDept(dept);
return getDataTable(list);
return AjaxResult.success(list);
}
}

2
cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java
View File

@ -70,4 +70,6 @@ public interface TAmentPartyAffairsMapper
List<Map<String, Object>> ndkhbz(TAmentPartyAffairs am);
List<Map<String, Object>> bmwcqk(TAmentPartyAffairs am);
List<Map<String, Object>> groupAll(TAmentPartyAffairs am);
}

2
cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java
View File

@ -70,4 +70,6 @@ public interface ITAmentPartyAffairsService
List<Map<String, Object>> ndkhbz(TAmentPartyAffairs am);
List<Map<String, Object>> bmwcqk(TAmentPartyAffairs am);
List<Map<String, Object>> groupAll(TAmentPartyAffairs am);
}

4
cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java
View File

@ -117,4 +117,8 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService
public List<Map<String, Object>> bmwcqk(TAmentPartyAffairs am){
return tAmentPartyAffairsMapper.bmwcqk(am);
}
@Override
public List<Map<String, Object>> groupAll(TAmentPartyAffairs am){
return tAmentPartyAffairsMapper.groupAll(am);
}
}

12
cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
View File

@ -116,6 +116,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY
dept_id,type
</select>
<select id="groupAll" resultType="map">
SELECT
shot_name,
SUM( score ) score,
IF( SUM( now_score ), SUM( now_score ), 0 ) nowScore,
ROUND(IF( SUM( now_score ), SUM( now_score ), 0 )/ SUM( score )) percent
FROM
t_ament_party_affairs
GROUP BY
type
</select>
<insert id="insertTAmentPartyAffairs" parameterType="TAmentPartyAffairs" useGeneratedKeys="true" keyProperty="id">
insert into t_ament_party_affairs