From 9c2991ee8d871ed1957691f3ee7c3d87935b55ee Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 19:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=A8=E7=81=AB=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8A=A8=E7=81=AB=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=A4=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E7=85=A7=E7=89=87=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=82=E5=B9=B6=E5=9C=A8=E4=BD=9C=E4=B8=9A=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=8D=95=E4=BD=8D=E5=90=8E=E3=80=81=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E5=8D=95=E4=BD=8D=E5=89=8D=E5=A2=9E=E5=8A=A0=E2=80=9C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=83=A8=E9=97=A8=E2=80=9D=E5=92=8C=E2=80=9C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E7=AE=A1=E9=83=A8=E9=97=A8=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/AppHotworkCfdController.java | 53 +++++++++++++++++-- .../controller/gf/AppGFHotworkController.java | 4 ++ .../highriskwork/HotworkCfdMapper.xml | 41 ++++++++++++-- 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 9e5d2a14..88ab5c77 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -9,6 +9,7 @@ import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; +import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.highriskwork.*; import com.zcloud.util.*; import com.zcloud.util.mq.MqSendUtil; @@ -50,6 +51,8 @@ public class AppHotworkCfdController extends BaseController { private SendMessageUtil sendMessageUtil; @Resource private MqSendUtil mqSendUtil; + @Autowired + private ImgFilesService imgFilesService; /** * 获取编码 @@ -59,7 +62,6 @@ public class AppHotworkCfdController extends BaseController { */ @RequestMapping(value = "/getCode") @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "获取编码") public Object getCode() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -182,8 +184,32 @@ public class AppHotworkCfdController extends BaseController { if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())) { throw new RuntimeException("系统异常"); } - System.out.println("amazing:!!!!!" + JSONObject.toJSONString(response)); } + map.put("HOTWORK_ID", pd.get("HOTWORK_ID")); + map.put("result", errInfo); + return map; + } + + @RequestMapping("uploadImg") + @ResponseBody + public Object uploadImg(@RequestParam(value="FFILE",required=false) MultipartFile[] files,@RequestParam(value="HOTWORK_ID",required=false) String ID) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + 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); + pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd.put("TYPE", 115); + pd.put("FOREIGN_KEY", ID); + imgFilesService.save(pd); + } + map.put("result", errInfo); return map; } @@ -595,6 +621,23 @@ public class AppHotworkCfdController extends BaseController { } switch (status) { + // created by liu jun 2024-01-30 description: 作业负责人之前添加项目主管部门负责人签字，为什么状态码时1.5，因为前端代码有判断，小于1则不能提交所以这里写1.5 + case "1.5": { + 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); + + pd2.put("BELONGING_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("BELONGING_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("BELONGING_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + } + break; + } case "2"://确认 if (files != null && files.length > 0) { MultipartFile file = files[0]; @@ -1329,7 +1372,6 @@ public class AppHotworkCfdController extends BaseController { return ; } - /**列表 * @param page * @throws Exception @@ -1400,7 +1442,6 @@ public class AppHotworkCfdController extends BaseController { */ @RequestMapping(value="/list") @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "列表") public Object list(Page page) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -1433,6 +1474,10 @@ public class AppHotworkCfdController extends BaseController { map.put("gasList", hotworkGasCfdService.listAll(pd)); map.put("imgList", hotworkAcceptUserCfdService.findByIds(pd)); map.put("imgList1", hotworkAcceptUserCfdService.findById(pd)); + PageData condition = new PageData(); + condition.put("TYPE","115"); + condition.put("FOREIGN_KEY",pd.getString("HOTWORK_ID")); + map.put("imgList2",imgFilesService.listAll(condition)); map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java index 58657fa9..5b069778 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java @@ -7,6 +7,7 @@ import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.gf.*; import com.zcloud.service.mq.SendMessageService; import com.zcloud.util.*; @@ -51,6 +52,9 @@ public class AppGFHotworkController extends BaseController { @Resource private SendMessageService mqClient; + @Resource + private ImgFilesService imgFilesService; + /** * 获取编码 * diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index df9170bb..959750d3 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -88,7 +88,12 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, - f.ANALYZE_TIME + f.ANALYZE_TIME, + f.BELONGING_DEPARTMENT_ID, + f.BELONGING_USER_ID, + f.BELONGING_USER_SIGNER_PATH, + f.BELONGING_USER_SIGNER_TIME, + f.BELONGING_CONTENT @@ -167,7 +172,12 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, - ANALYZE_TIME + ANALYZE_TIME, + BELONGING_DEPARTMENT_ID, + BELONGING_USER_ID, + BELONGING_USER_SIGNER_PATH, + BELONGING_USER_SIGNER_TIME, + BELONGING_CONTENT @@ -246,7 +256,12 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, - #{ANALYZE_TIME} + #{ANALYZE_TIME}, + #{BELONGING_DEPARTMENT_ID}, + #{BELONGING_USER_ID}, + #{BELONGING_USER_SIGNER_PATH}, + #{BELONGING_USER_SIGNER_TIME}, + #{BELONGING_CONTENT} @@ -355,6 +370,11 @@ ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + BELONGING_DEPARTMENT_ID = #{BELONGING_DEPARTMENT_ID}, + BELONGING_USER_ID = #{BELONGING_USER_ID}, + BELONGING_USER_SIGNER_PATH = #{BELONGING_USER_SIGNER_PATH}, + BELONGING_USER_SIGNER_TIME = #{BELONGING_USER_SIGNER_TIME}, + BELONGING_CONTENT = #{BELONGING_CONTENT}, HOTWORK_ID = HOTWORK_ID where HOTWORK_ID = #{HOTWORK_ID} @@ -573,7 +593,14 @@ aacu.NAME as ACCEPT_CONFESS_USER_NAME, anad.NAME as ANALYZE_DEPARTMENT_NAME, - anau.NAME as ANALYZE_USER_NAME + anau.NAME as ANALYZE_USER_NAME, + f.BELONGING_DEPARTMENT_ID, + belong.NAME as BELONGING_DEPARTMENT_NAME, + f.BELONGING_USER_ID, + belongU.NAME as BELONGING_USER_NAME, + f.BELONGING_USER_SIGNER_PATH, + f.BELONGING_USER_SIGNER_TIME, + f.BELONGING_CONTENT from f left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID @@ -608,6 +635,9 @@ left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID + + left join OA_DEPARTMENT belong on belong.DEPARTMENT_ID = f.BELONGING_DEPARTMENT_ID + left join SYS_USER belongU on belongU.USER_ID = f.BELONGING_USER_ID where f.HOTWORK_ID = #{HOTWORK_ID} @@ -828,6 +858,9 @@ and f.ANALYZE_USER_ID = #{pd.ANALYZE_USER_ID} + + and f.BELONGING_USER_ID = #{pd.BELONGING_USER_ID} +