From e0bb4fce21ecfddde69182a4c4204425a7a18268 Mon Sep 17 00:00:00 2001 From: Administrator <675300107> Date: Fri, 8 Apr 2022 17:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PRHeaderController.java | 36 ++++++++++++++++ .../purchaseorder/entity/PRDetail.java | 2 + .../service/impl/PRHeaderServiceImpl.java | 5 +++ .../toolman/service/FileAssociateService.java | 37 ++++++++++++++++ .../impl/FileAssociateServiceImpl.java | 42 +++++++++++++++++++ .../resources/mapper/oss/FileAssociateDao.xml | 15 ++++++- .../mapper/purchaseorder/PRDetailMapper.xml | 2 + 7 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gaotao/modules/toolman/service/FileAssociateService.java create mode 100644 src/main/java/com/gaotao/modules/toolman/service/impl/FileAssociateServiceImpl.java diff --git a/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java b/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java index aa2142d..e8f25d3 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java @@ -5,6 +5,7 @@ import com.gaotao.common.utils.R; import com.gaotao.modules.app.entity.Supplier; import com.gaotao.modules.app.query.SupplierQuery; import com.gaotao.modules.app.service.SupplierService; +import com.gaotao.modules.oss.vo.FileAssociateData; import com.gaotao.modules.purchaseorder.entity.AuthorizationHist; import com.gaotao.modules.purchaseorder.entity.PRDetail; import com.gaotao.modules.purchaseorder.entity.TblBaseData; @@ -14,6 +15,7 @@ import com.gaotao.modules.purchaseorder.query.TblBaseDataQuery; import com.gaotao.modules.purchaseorder.service.AuthorizationHistService; import com.gaotao.modules.purchaseorder.service.PRHeaderService; import com.gaotao.modules.purchaseorder.service.TblBaseDataService; +import com.gaotao.modules.toolman.service.FileAssociateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -39,6 +41,8 @@ public class PRHeaderController { private SupplierService supplierService; @Autowired private AuthorizationHistService authorizationHistService; + @Autowired + private FileAssociateService fileAssociateService; /** * @Method getViewIfsToolList @@ -173,4 +177,36 @@ public class PRHeaderController { List resultList = authorizationHistService.getReviewSteps(authorizationHist); return R.ok().put("rows",resultList); } + + /** + * @Method delFileAssociate + * @Description: 删除文件关联信息 + * @author zuowenwen + * @Version 1.0 + * @param: fileAssociateData + * @return: com.gaotao.common.utils.R + * @throws + * @date 2022/1/7 13:46 + */ + @PostMapping("delFileAssociate") + public R delFileAssociate(@RequestBody FileAssociateData fileAssociateData){ + fileAssociateService.delFileAssociate(fileAssociateData); + return R.ok("操作成功！"); + } + + /** + * @Method saveFileAssociate + * @Description: 保存文件关联关系 + * @author zuowenwen + * @Version 1.0 + * @param: list + * @return: com.gaotao.common.utils.R + * @throws + * @date 2022/1/7 14:33 + */ + @PostMapping("saveFileAssociate") + public R saveFileAssociate(@RequestBody List list){ + fileAssociateService.saveFileAssociate(list); + return R.ok("操作成功！"); + } } diff --git a/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java b/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java index fb4b42d..dd3d3f1 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java @@ -201,4 +201,6 @@ public class PRDetail { private String strAuthorizeFlag; private Date enterDate; + + private String familyName; } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java index 425209f..97fcef3 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java @@ -117,6 +117,11 @@ public class PRHeaderServiceImpl extends ServiceImpl i authorizationHistMapper.insertSelective(authorizationHist); } }else { + PRHeaderQuery prHeaderQuery = new PRHeaderQuery(); + prHeaderQuery.setRequisitionno(prDetailQuery.getRequisitionno()); + prHeaderQuery.setSite(prDetailQuery.getSite()); + prHeaderQuery.setOrderref1(prDetailQuery.getOrderref1()); + prHeaderMapper.updatePRHeader(prHeaderQuery); requisitionNo = prDetailQuery.getRequisitionno(); // this.update(prDetailQuery,new UpdateWrapper<>().eq()); prDetailMapper.updatePRDetail(prDetailQuery); diff --git a/src/main/java/com/gaotao/modules/toolman/service/FileAssociateService.java b/src/main/java/com/gaotao/modules/toolman/service/FileAssociateService.java new file mode 100644 index 0000000..08c3582 --- /dev/null +++ b/src/main/java/com/gaotao/modules/toolman/service/FileAssociateService.java @@ -0,0 +1,37 @@ +package com.gaotao.modules.toolman.service; + +import com.gaotao.modules.oss.vo.FileAssociateData; + +import java.util.List; + +/** + * @author zww + * @version 1.0.0 + * @ClassName FileAssociateService.java + * @Description TODO + * @createTime 2022年01月07日 13:39 + */ +public interface FileAssociateService { + + /** + * @Method delFileAssociate + * @Description: 删除文件关联关系 + * @author zuowenwen + * @Version 1.0 + * @param: fileAssociateData + * @throws + * @date 2022/1/7 14:29 + */ + void delFileAssociate(FileAssociateData fileAssociateData); + + /** + * @Method saveFileAssociate + * @Description: 保存 文件关联关系 + * @author zuowenwen + * @Version 1.0 + * @param: list + * @throws + * @date 2022/1/7 14:32 + */ + void saveFileAssociate(List list); +} diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/FileAssociateServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/FileAssociateServiceImpl.java new file mode 100644 index 0000000..6ff01a4 --- /dev/null +++ b/src/main/java/com/gaotao/modules/toolman/service/impl/FileAssociateServiceImpl.java @@ -0,0 +1,42 @@ +package com.gaotao.modules.toolman.service.impl; + +import com.gaotao.modules.oss.dao.FileAssociateDao; +import com.gaotao.modules.oss.service.SysOssService; +import com.gaotao.modules.oss.vo.FileAssociateData; +import com.gaotao.modules.toolman.service.FileAssociateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author zww + * @version 1.0.0 + * @ClassName FileAssociateServiceImpl.java + * @Description TODO + * @createTime 2022年01月07日 13:41 + */ +@Service +public class FileAssociateServiceImpl implements FileAssociateService { + + @Autowired + private FileAssociateDao fileAssociateDao; + @Autowired + private SysOssService sysOssService; + + @Override + @Transactional + public void delFileAssociate(FileAssociateData fileAssociateData) { + fileAssociateDao.deleteFileAssociate(fileAssociateData); + sysOssService.removeById(fileAssociateData.getSysOssId()); + } + + @Override + @Transactional + public void saveFileAssociate(List list) { + for (FileAssociateData fileAssociateData : list) { + fileAssociateDao.insertSelective(fileAssociateData); + } + } +} diff --git a/src/main/resources/mapper/oss/FileAssociateDao.xml b/src/main/resources/mapper/oss/FileAssociateDao.xml index 913100c..14710ce 100644 --- a/src/main/resources/mapper/oss/FileAssociateDao.xml +++ b/src/main/resources/mapper/oss/FileAssociateDao.xml @@ -23,7 +23,20 @@ delete from file_associate - where id = #{id,jdbcType=INTEGER} + + + and id = #{id,jdbcType=INTEGER} + + + and site = #{site,jdbcType=VARCHAR} + + + and sys_oss_id = #{sysOssId,jdbcType=INTEGER} + + + and type = #{type,jdbcType=VARCHAR} + + diff --git a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml index 0fcb288..2b7fb88 100644 --- a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml +++ b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml @@ -57,9 +57,11 @@ ,isnull(C.can_auth_flag ,'N') as strCanAuthFlag ,(case B.ApproveResult when 'Y' then '已通过' else '未通过' end) as strApproveResult ,B.EnterDate as enterDate + ,D.FamilyName as familyName from PRDetail A left join PRHeader B on A.RequisitionNo = B.RequisitionNo and A.Site = B.Site left join authorization_hist C on A.RequisitionNo = C.order_ref1 and A.site = C.site and C.auth_user_id = #{param2.strUserId,jdbcType=VARCHAR} + left join PartFamily D on B.OrderRef1 = D.FamilyID and B.Site = D.Site and A.Site=#{param2.site,jdbcType=VARCHAR}