工具优化

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<AuthorizationHist> 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<FileAssociateData> list){
+        fileAssociateService.saveFileAssociate(list);
+        return R.ok("操作成功！");
+    }
 }

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;
 }

src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java

@@ -117,6 +117,11 @@ public class PRHeaderServiceImpl extends ServiceImpl<PRHeaderMapper, PRHeader> 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);

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<FileAssociateData> list);
+}

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<FileAssociateData> list) {
+        for (FileAssociateData fileAssociateData : list) {
+            fileAssociateDao.insertSelective(fileAssociateData);
+        }
+    }
+}

src/main/resources/mapper/oss/FileAssociateDao.xml

@@ -23,7 +23,20 @@
 
   <delete id="deleteFileAssociate" parameterType="java.lang.Integer">
     delete from file_associate
-    where id = #{id,jdbcType=INTEGER}
+    <where>
+      <if test="id != null">
+        and id = #{id,jdbcType=INTEGER}
+      </if>
+      <if test="site != null and site != ''">
+        and site = #{site,jdbcType=VARCHAR}
+      </if>
+      <if test="sysOssId != null">
+        and sys_oss_id = #{sysOssId,jdbcType=INTEGER}
+      </if>
+      <if test="type != null and type != ''">
+        and type = #{type,jdbcType=VARCHAR}
+      </if>
+    </where>
   </delete>
 
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.gaotao.modules.oss.vo.FileAssociateData" useGeneratedKeys="true">

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
         <where>
             <if test="param2.site != null and param2.site != ''">
                 and A.Site=#{param2.site,jdbcType=VARCHAR}