haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除判断

This commit is contained in:
jjLv 2024-08-20 18:11:38 +08:00
parent 6ae83c160d
commit 2282373b18
8 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java
View File

@ -67,4 +67,7 @@ public class BaseProject extends BaseEntity
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private MultipartFile file;
/** 工程数量 */
@Excel(name = "工程数量", cellType = ColumnType.NUMERIC)
private int pronum;
}

4
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java
View File

@ -28,6 +28,10 @@ public class GtVo
@Excel(name = "工程id")
private long proId;
/** 班组数量 */
@Excel(name = "班组数量")
private int teamNum;
/** 杆塔id */
// @Excel(name = "杆塔id", cellType = ColumnType.NUMERIC)
private int gtId;

1
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java
View File

@ -345,4 +345,5 @@ public class BraceletController extends BaseController {
log.error(e.toString(), e);
}
}
}

2
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EngineeringController.java
View File

@ -12,6 +12,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.entity.bracelet.exportVo.EngineeringExportVo;
import com.bonus.common.entity.bracelet.exportVo.GtExportVo;
import com.bonus.common.entity.bracelet.vo.AttributeVo;
import com.bonus.common.entity.bracelet.vo.DeviceVo;
import com.bonus.common.entity.bracelet.vo.EngineeringVo;
import com.bonus.common.entity.bracelet.vo.GtVo;
@ -222,4 +223,5 @@ public class EngineeringController extends BaseController {
log.error(e.toString(), e);
}
}
}

2
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EngineeringMapper.java
View File

@ -64,7 +64,7 @@ public interface EngineeringMapper {
* @param vo
* @return
*/
int updateGt(GtVo vo);
int updateGt(GtVo vo);
/**
* 删除杆塔信息

4
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
View File

@ -16,12 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="create_user" />
<result property="delFlag" column="del_flag" />
<result property="appnum" column="appnum" />
<result property="pronum" column="pronum" />
</resultMap>
<select id="selectProjectList" parameterType="com.bonus.common.entity.bracelet.vo.BaseProject" resultMap="BaseProjectResult">
select a.id, depart_name, head_name, contact_information,count(b.source_id) as appnum, remarks,a.create_user,a.update_user
select a.id, depart_name, head_name, contact_information,count(b.source_id) as appnum, remarks,a.create_user,a.update_user,count(tp.id) as pronum
from tb_project_depart a
left join sys_file_source b on a.id = b.source_id and b.source_type = 5 and b.del_flag = 0
left join tb_project tp on a.id = tp.depart_id and tp.del_flag = 0
<where>
a.del_flag = 0
<if test="projectDepartName != null and projectDepartName != ''">

3
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
View File

@ -41,8 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDeviceById" parameterType="int" resultType="com.bonus.common.entity.bracelet.vo.DeviceVo">
select td.id as deviceId,td.dev_type as deviceType,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,td.dev_index as deviceIndex
select td.id as deviceId,tdd.dict_label AS deviceTypeName,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,td.dev_index as deviceIndex
from tb_device td
left join sys_dict_data tdd on tdd.dict_value=td.dev_type AND tdd .dict_type='sys_device_type'
where td.id = #{deviceId} and td.del_flag = 0
</select>

4
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
View File

@ -43,8 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--根据工程id获得杆塔详细信息-->
<select id="selectGtById" resultType="com.bonus.common.entity.bracelet.vo.GtVo">
select tpp.pro_id as proId,tpp.id as gtId,tpp.power_name as gtCode,tpp.lon as lon,tpp.lat as lat
select tpp.pro_id as proId,tpp.id as gtId,tpp.power_name as gtCode,tpp.lon as lon,tpp.lat as lat,count(tsb.id) as teamNum
from tb_project_power tpp
left join tb_sh_box tsb on tpp.id = tsb.gt_id and tsb.team_id is not null and tsb.del_flag = 0
<where>
tpp.del_flag = 0
<if test="proId != null and proId!=''">
@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND INSTR(tpp.power_name,#{gtCode}) > 0
</if>
</where>
group by tpp.pro_id,tpp.id
order by tpp.id ASC
</select>