删除无用代码
parent
439dc49719
commit
11585c5133
|
@ -623,48 +623,6 @@ public class AppHotworkCfdController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (status) {
|
switch (status) {
|
||||||
// created by liu jun 2024-01-30 description: 安全项检查人签字
|
|
||||||
case "0.9": {
|
|
||||||
if (files != null && files.length > 0) {
|
|
||||||
MultipartFile file = files[0];
|
|
||||||
String ffile = DateUtil.getDays();
|
|
||||||
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
|
||||||
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
|
|
||||||
// 如果审批通过则进入下一阶段
|
|
||||||
if (pd.get("APPROVAL_STATUS").equals("1")) {
|
|
||||||
pd2.put("APPLY_STATUS", "1");
|
|
||||||
} else {
|
|
||||||
pd2.put("APPLY_STATUS", "-0.9");
|
|
||||||
}
|
|
||||||
hotworkCfdService.edit(pd2);
|
|
||||||
PageData condition = new PageData();
|
|
||||||
condition.put("HOTWORK_ID", pd2.get("HOTWORK_ID"));
|
|
||||||
condition.put("TYPE","2");
|
|
||||||
condition.put("APPROVAL_SIGNATURE",Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
|
||||||
condition.put("APPROVAL_OPINIONS",pd.get("CONTENT"));
|
|
||||||
condition.put("APPROVAL_SIGNATURE_TIME",pd.get("SIGNER_TIME"));
|
|
||||||
condition.put("APPROVAL_STATUS",pd.getString("APPROVAL_STATUS"));
|
|
||||||
hotworkCfdService.approval(condition);
|
|
||||||
// 保存安全项信息
|
|
||||||
hotworkToMeasuresCfdService.delete(pd2);
|
|
||||||
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
|
|
||||||
for (JSONObject json : list) {
|
|
||||||
PageData measures = new PageData();
|
|
||||||
measures.put("HOTWORKTOMEASURES_ID", this.get32UUID()); // 主键
|
|
||||||
measures.put("HOTWORK_ID", pd2.get("HOTWORK_ID"));
|
|
||||||
measures.put("BUS_HOTWORK_MEASURES_ID", json.get("BUS_HOTWORK_MEASURES_ID"));
|
|
||||||
measures.put("ANSWER1", json.get("ANSWER1"));
|
|
||||||
measures.put("ANSWER2", json.get("ANSWER2"));
|
|
||||||
measures.put("ANSWER3", json.get("ANSWER3"));
|
|
||||||
measures.put("ANSWER4", json.get("ANSWER4"));
|
|
||||||
measures.put("STATUS", json.get("STATUS"));
|
|
||||||
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
|
|
||||||
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
|
|
||||||
hotworkToMeasuresCfdService.save(measures);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// 作业负责人审批
|
// 作业负责人审批
|
||||||
case "2": {//确认
|
case "2": {//确认
|
||||||
if (files != null && files.length > 0) {
|
if (files != null && files.length > 0) {
|
||||||
|
|
|
@ -829,9 +829,6 @@
|
||||||
<if test="pd.ANALYZE_USER_ID != null and pd.ANALYZE_USER_ID != ''">
|
<if test="pd.ANALYZE_USER_ID != null and pd.ANALYZE_USER_ID != ''">
|
||||||
and f.ANALYZE_USER_ID = #{pd.ANALYZE_USER_ID}
|
and f.ANALYZE_USER_ID = #{pd.ANALYZE_USER_ID}
|
||||||
</if>
|
</if>
|
||||||
<if test="pd.BELONGING_USER_ID != null and pd.BELONGING_USER_ID != ''">
|
|
||||||
and f.BELONGING_USER_ID = #{pd.BELONGING_USER_ID}
|
|
||||||
</if>
|
|
||||||
<choose>
|
<choose>
|
||||||
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
|
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
|
||||||
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
|
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
|
||||||
|
|
Loading…
Reference in New Issue