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

动火安全措施确认

pull/4/head
fangjiakai 2024-01-24 14:04:39 +08:00
parent 25d0947d7f
commit e3d2091070
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java
View File

@ -29,14 +29,11 @@ public class AppEightWorkController extends BaseController {
String errorInfo = "success"; String errorInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if (null != file && !file.isEmpty()) { String ffile = DateUtil.getDays();
String ffile = DateUtil.getDays(); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); map.put("FILE_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("FILE_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
map.put("result",errorInfo); map.put("result",errorInfo);
map.put("pd",pd);
return map; return map;
} }
@ -47,7 +44,7 @@ public class AppEightWorkController extends BaseController {
String errorInfo = "success"; String errorInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
smb.deleteFile(pd.getString("CORPINFO_ID")); smb.deleteFile(pd.getString("FILE_PATH"));
map.put("result",errorInfo); map.put("result",errorInfo);
return map; return map;
} }

5
src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
View File

@ -272,16 +272,17 @@ public class HotworkServiceImpl implements HotworkService {
} }
private void saveMeasures(PageData pd) { private void saveMeasures(PageData pd) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString()); List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
for (JSONObject json : list) { for (JSONObject json : list) {
PageData measure = new PageData(); PageData measure = new PageData();
measure.put("HOTWORKTOMEASURES_ID",json.get("BUS_HOTWORK_MEASURES_ID")); measure.put("HOTWORKTOMEASURES_ID",json.get("HOTWORKTOMEASURES_ID"));
measure.put("STATUS", json.get("STATUS")); measure.put("STATUS", json.get("STATUS"));
measure.put("ANSWER1", json.get("ANSWER1")); measure.put("ANSWER1", json.get("ANSWER1"));
measure.put("ANSWER2", json.get("ANSWER2")); measure.put("ANSWER2", json.get("ANSWER2"));
measure.put("ANSWER3", json.get("ANSWER3")); measure.put("ANSWER3", json.get("ANSWER3"));
measure.put("ANSWER4", json.get("ANSWER4")); measure.put("ANSWER4", json.get("ANSWER4"));
measure.put("SIGN_PATH", json.get("SIGN_PATH")); measure.put("SIGN_PATH", json.get("SIGN_PATH"));
measure.put("SIGN_TIME", json.get("SIGN_TIME"));
measure.put("IMG_PATH", json.get("IMG_PATH")); measure.put("IMG_PATH", json.get("IMG_PATH"));
hotworkToMeasuresMapper.edit(measure); hotworkToMeasuresMapper.edit(measure);
} }

BIN
src/main/java/com/zcloud/util/img.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

2
src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml
View File

@ -106,7 +106,7 @@
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
where where
f.HOTWORK_ID = #{pd.HOTWORK_ID} f.HOTWORK_ID = #{HOTWORK_ID}
and and
f.SIGN_TIME is null f.SIGN_TIME is null
</select> </select>

9
src/main/resources/mybatis/datasource/eightwork/HotworkToMeasuresMapper.xml
View File

@ -77,7 +77,7 @@
HOTWORKTOMEASURES_ID, HOTWORKTOMEASURES_ID,
CONFIRM_ID CONFIRM_ID
) values ) values
<foreach collection="list" item="item" index="index" open="(" separator="),(" close=")"> <foreach collection="list" item="item" index="index" separator="," >
( (
#{item.HOTWORK_ID}, #{item.HOTWORK_ID},
#{item.BUS_HOTWORK_MEASURES_ID}, #{item.BUS_HOTWORK_MEASURES_ID},
@ -106,7 +106,8 @@
ANSWER3 = #{ANSWER3}, ANSWER3 = #{ANSWER3},
ANSWER4 = #{ANSWER4}, ANSWER4 = #{ANSWER4},
SIGN_PATH = #{SIGN_PATH}, SIGN_PATH = #{SIGN_PATH},
IMG_PATH = #{IMG_PATH} IMG_PATH = #{IMG_PATH},
SIGN_TIME = #{SIGN_TIME}
where where
HOTWORKTOMEASURES_ID = #{HOTWORKTOMEASURES_ID} HOTWORKTOMEASURES_ID = #{HOTWORKTOMEASURES_ID}
</update> </update>
@ -145,9 +146,11 @@
<select id="listAllMeasuresForSign" parameterType="pd" resultType="pd"> <select id="listAllMeasuresForSign" parameterType="pd" resultType="pd">
select select
<include refid="Field"></include> f.HOTWORKTOMEASURES_ID,
m.*
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_hotwork_measures m on f.BUS_HOTWORK_MEASURES_ID = m.BUS_HOTWORK_MEASURES_ID
where where
f.HOTWORK_ID = #{HOTWORK_ID} and f.CONFIRM_ID = #{CONFIRM_ID} f.HOTWORK_ID = #{HOTWORK_ID} and f.CONFIRM_ID = #{CONFIRM_ID}
</select> </select>