Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
huangzj
2023-07-04 08:32:00 +08:00
parent 26a14a7c6b
commit 1b3013e87a
8 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java
View File

@@ -60,5 +60,5 @@ public interface AppProjectMapper extends BaseMapper<AppProjectPO> {
// " order by a.create_time desc",
// "</script>"}
// )
Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm, @Param("userId") String userId);
Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm);
}

8
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
View File

@@ -25,14 +25,14 @@
<select id="getPageVo" resultType="com.njcn.csdevice.pojo.vo.AppProjectVO">
select a.*,b.pid as engineering_id,(select name from cs_ledger c where c.id=b.pid) as engineering_name from cs_project a LEFT JOIN cs_ledger b on a.id = b.id where 1=1
and a.status ="1"
<if test="userId != null and userId !=''">
and exists (select 1 from cs_engineering_user d where d.engineering_id=b.pid and d.user_id=#{userId})
</if>
<!-- <if test="userId != null and userId !=''">-->
<!-- and exists (select 1 from cs_engineering_user d where d.engineering_id=b.pid and d.user_id=#{userId})-->
<!-- </if>-->
<if test="temp!=null and temp.projectId != null and temp.projectId !=''">
AND a.id = #{temp.projectId}
</if>
<if test="temp!=null and temp.engineeringId != null and temp.engineeringId !=''">
AND b.id = #{temp.engineeringId}
AND b.pid = #{temp.engineeringId}
</if>
<if test="temp!=null and temp.endTime != null and temp.endTime !=''">
AND a.create_time &lt;= #{temp.endTime}"

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
View File

@@ -56,6 +56,9 @@
<if test="projectEquipmentQueryParm!=null and projectEquipmentQueryParm.projectId != null and projectEquipmentQueryParm.projectId !=''">
AND b.id = #{projectEquipmentQueryParm.projectId}
</if>
<if test="projectEquipmentQueryParm!=null and projectEquipmentQueryParm.engineerId != null and projectEquipmentQueryParm.engineerId !=''">
AND a.id = #{projectEquipmentQueryParm.engineerId}
</if>
order by a.create_time desc
</select>