wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

dev
wangpeng 2024-03-29 16:30:23 +08:00
parent ec9383f80f 6ff71d1f1f
commit 4ea47ce16a
7 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
View File

@ -43,12 +43,8 @@ public class AppTrafficSafetyMeetingController extends BaseController {
if (Tools.notEmpty(MEETING_TITLE))
pd.put("MEETING_TITLE", MEETING_TITLE.trim());
// String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件
// if (Tools.notEmpty(MEETING_TYPE))
// pd.put("MEETING_TYPE", MEETING_TYPE.trim());
page.setPd(pd);
List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeeting(page);
List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeetingUser(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

5
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java
View File

@ -59,7 +59,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
String fileName =file.getOriginalFilename();
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@ -97,7 +97,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
//String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
String fileName =file.getOriginalFilename();
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));

7
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java
View File

@ -13,7 +13,12 @@ public interface TrafficSafetyMeetingMapper {
* @param page
* @return
*/
List<PageData> datalistPage(Page page);
List<PageData> datalistPage(Page page); /**
* 列表
* @param page
* @return
*/
List<PageData> datalistPageUser(Page page);
/**删除
* @param pd

1
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java
View File

@ -7,6 +7,7 @@ import java.util.List;
public interface TrafficSafetyMeetingService {
List<PageData> listForSafetyMeeting(Page page);
List<PageData> listForSafetyMeetingUser(Page page);
void delete(PageData pd) throws Exception;

10
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java
View File

@ -26,6 +26,16 @@ public class TrafficSafetyMeetingServiceImpl implements TrafficSafetyMeetingServ
return trafficSafetyMeetingMapper.datalistPage(page);
}
/**
* 列表
* @param page
* @return
*/
@Override
public List<PageData> listForSafetyMeetingUser(Page page) {
return trafficSafetyMeetingMapper.datalistPageUser(page);
}
/**删除
* @param pd
* @throws Exception

22
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
View File

@ -149,6 +149,28 @@
<if test="pd.MEETING_TYPE != null and pd.MEETING_TYPE != ''"><!-- 关键词检索-会议类型 -->
and f.MEETING_TYPE = #{pd.MEETING_TYPE}
</if>
ORDER BY f.CREATETIME DESC
</select>
<!--列表-->
<select id="datalistPageUser" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
left join bus_traffic_safety_meeting_recipient e on f.SAFETY_MEETING_ID = e.SAFETY_MEETING_ID
where f.ISDELETE = '0'
AND
e.PRACTITIONER = #{pd.USER_ID}
<if test="pd.MEETING_TITLE != null and pd.MEETING_TITLE != ''"><!-- 关键词检索-会议标题 -->
and f.MEETING_TITLE like CONCAT('%',#{pd.MEETING_TITLE},'%')
</if>
<if test="pd.MEETING_TYPE != null and pd.MEETING_TYPE != ''"><!-- 关键词检索-会议类型 -->
and f.MEETING_TYPE = #{pd.MEETING_TYPE}
</if>
ORDER BY f.CREATETIME DESC
</select>
<select id="getInfo" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

4
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml
View File

@ -137,9 +137,11 @@
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
<include refid="Field"></include>,
i.CORP_NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
where
f.MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID}
</select>