测试问题修改
This commit is contained in:
parent
9f87cc433f
commit
a8cba8ef4d
|
|
@ -32,7 +32,7 @@ public class DigitalSignageController {
|
||||||
@PostMapping(value = "getProTree")
|
@PostMapping(value = "getProTree")
|
||||||
@DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理
|
@DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理
|
||||||
public ServerResponse getProTree(EncryptedReq<QueryParamDto> dto) {
|
public ServerResponse getProTree(EncryptedReq<QueryParamDto> dto) {
|
||||||
return service.getProTree(dto.getData());
|
return service.getProTree();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation("电子看板-杆塔施工进度数量")
|
@ApiOperation("电子看板-杆塔施工进度数量")
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,11 @@ import com.bonus.digitalSignage.utils.ServerResponse;
|
||||||
public interface DigitalSignageService {
|
public interface DigitalSignageService {
|
||||||
/**
|
/**
|
||||||
* 电子看板-工程树
|
* 电子看板-工程树
|
||||||
* @param data
|
|
||||||
* @return ServerResponse
|
* @return ServerResponse
|
||||||
* @author cwchen
|
* @author cwchen
|
||||||
* @date 2025/4/24 10:39
|
* @date 2025/4/24 10:39
|
||||||
*/
|
*/
|
||||||
ServerResponse getProTree(QueryParamDto data);
|
ServerResponse getProTree();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 电子看板-杆塔施工进度数量
|
* 电子看板-杆塔施工进度数量
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,8 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
|
||||||
private DigitalSignageDao dao;
|
private DigitalSignageDao dao;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ServerResponse getProTree(QueryParamDto dto) {
|
public ServerResponse getProTree() {
|
||||||
|
QueryParamDto dto = new QueryParamDto();
|
||||||
List<ProTreeVo> tree = new ArrayList<>();
|
List<ProTreeVo> tree = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
List<ProTreeVo> list = Optional.ofNullable(dao.getProTree(dto)).orElseGet(ArrayList::new);
|
List<ProTreeVo> list = Optional.ofNullable(dao.getProTree(dto)).orElseGet(ArrayList::new);
|
||||||
|
|
|
||||||
|
|
@ -50,13 +50,13 @@
|
||||||
<!--电子看板-杆塔施工进度数量-->
|
<!--电子看板-杆塔施工进度数量-->
|
||||||
<select id="getTowerProgressNum"
|
<select id="getTowerProgressNum"
|
||||||
resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$TowerProgressNumVo">
|
resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$TowerProgressNumVo">
|
||||||
SELECT COUNT(IF(tower_progress >= 1, 1, NULL)) AS num1,
|
SELECT COUNT(IF(tower_progress = 1, 1, NULL)) AS num1,
|
||||||
COUNT(IF(tower_progress >= 2, 1, NULL)) AS num2,
|
COUNT(IF(tower_progress = 2, 1, NULL)) AS num2,
|
||||||
COUNT(IF(tower_progress >= 3, 1, NULL)) AS num3,
|
COUNT(IF(tower_progress = 3, 1, NULL)) AS num3,
|
||||||
COUNT(IF(tower_progress >= 4, 1, NULL)) AS num4,
|
COUNT(IF(tower_progress = 4, 1, NULL)) AS num4,
|
||||||
COUNT(IF(tower_progress >= 5, 1, NULL)) AS num5,
|
COUNT(IF(tower_progress = 5, 1, NULL)) AS num5,
|
||||||
COUNT(IF(tower_progress >= 6, 1, NULL)) AS num6,
|
COUNT(IF(tower_progress = 6, 1, NULL)) AS num6,
|
||||||
COUNT(IF(tower_progress >= 7, 1, NULL)) AS num7,
|
COUNT(IF(tower_progress = 7, 1, NULL)) AS num7,
|
||||||
COUNT(IF(tower_progress = 0, 1, NULL)) AS num8
|
COUNT(IF(tower_progress = 0, 1, NULL)) AS num8
|
||||||
FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1'
|
FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1'
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue