2023年9月4日10:36:17

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/AttachmngsController.java

@@ -41,6 +41,7 @@ public class AttachmngsController {
                                        @RequestParam("attachId") Long attachId,
                                        @RequestParam("longitude") String longitude,
                                        @RequestParam("latitude") String latitude,
+                                       @RequestParam("carRegNo") String carRegNo,
                                        @RequestParam("updateDate") String date,
                                        HttpServletRequest request) throws Exception {
         if (file.isEmpty()) {
@@ -56,7 +57,7 @@ public class AttachmngsController {
 
         SysUser user = SecurityUtils.getLoginUser().getUser();
 //        String watermark = longitude + "," + latitude + "-" + date + "-" + user.getNickName();
-        String watermark = address + "||" + date + "||" + user.getNickName();
+        String watermark = address + "||" + date + "||" + carRegNo;
         System.out.println( );
 //        String watermark = date;
         File file2 = AddWatermarkUtil.transferToFile(file);
@@ -76,6 +77,15 @@ public class AttachmngsController {
          AddWatermarkUtil.waterPress(file2, file2, Color.DARK_GRAY, 48, watermark);
 //        AddWatermarkUtil.addWaterMark(file2, file2, Color.DARK_GRAY, 48, watermark);
 
+        // 如果图片大于40kb压缩
+        if (AddWatermarkUtil.fileToTransfer(file2).getBytes().length > 240800) {
+            // 压缩
+            Thumbnails.of(file2)
+                    .scale(1f) //图片大小（长宽）压缩比例 从0-1，1表示原图
+                    .outputQuality(0.5f) //图片质量压缩比例 从0-1，越接近1质量越好
+                    .toFile(file2);
+        }
+
         // 转二进制
         byte[] bytes = AddWatermarkUtil.fileToTransfer(file2).getBytes();
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/OrderBillsPlansController.java

@@ -167,8 +167,10 @@ public class OrderBillsPlansController {
      * @return
      */
     @GetMapping("/up-receipts/{orderNo}")
-    public AjaxResult upReceipts(@PathVariable(value = "orderNo") Long orderNo) {
-        return orderBillsPlansService.upReceipts(orderNo);
+    public AjaxResult upReceipts(@PathVariable(value = "orderNo") Long orderNo,
+                                 @RequestParam(value = "actId",required = false) String actId,
+                                 @RequestParam(value = "entityId",required = false) String entityId) {
+        return orderBillsPlansService.upReceipts(orderNo,actId,entityId);
     }
 
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderBillsPlansMapper.java

@@ -187,6 +187,8 @@ public interface OrderBillsPlansMapper {
     Integer approved(String orderNo);
     void approvedTaskList(@Param("actId") String actId, @Param("entityId") String entityId);
 
+    void approvedTaskListV1(@Param("actId") String actId, @Param("entityId") String entityId,@Param("status") String status);
+
     /**
      * 审核不通过 IfStard=’B’，StartDate=’NOW’，Status_375=0
      * @param orderNo 报单号

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderBillsPlansService.java

@@ -100,5 +100,5 @@ public interface IOrderBillsPlansService {
      * @param orderNo
      * @return
      */
-    AjaxResult upReceipts(Long orderNo);
+    AjaxResult upReceipts(Long orderNo,String actId,String entityId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -169,7 +169,8 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
         Object actId = redisCache.getCacheObject("sys_config:risk.actId");
 
-        orderBillsPlans.setActId(Long.valueOf(actId.toString()));
+        vo.setActId(Long.valueOf(actId.toString()));
+        vo.setEntityId(orderBillsPlans.getLoadBillsEntityId());
 
         // 查找照片List
         List<Long> attachIdList = orderBillsPlansMapper.getAttachMngsAttachIdBySysIdAndEntityIdAndActId(orderBillsPlans);
@@ -450,9 +451,10 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      * @return
      */
     @Override
-    public AjaxResult upReceipts(Long orderNo) {
+    public AjaxResult upReceipts(Long orderNo,String actId,String entityId) {
         int i = orderBillsPlansMapper.upReceipts(orderNo);
-
+        orderBillsPlansMapper.approvedTaskListV1(actId,entityId,"2");
+        orderBillsPlansMapper.approvedTaskListV1(actId,entityId,"6");
         if (i == 1) {
             return AjaxResult.success("ok");
         } else {

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -109,6 +109,9 @@
     <update id="addAReviewComment">
         update loadbills set ApplyDate = CURRENT_TIMESTAMP, audit2Desc = #{audit2Desc} where SrcEntityID = #{entityId} and SrcLineNo = #{lineNo}
     </update>
+    <update id="approvedTaskListV1">
+        UPDATE wf_TaskList SET status= #{status} WHERE SYSID = '1' AND ACTID =#{actId} AND ENTITYID = #{entityId}
+    </update>
 
     <delete id="deleteLoadFeeItemsByEntityId">
         delete from LoadFeeItems where sysid = 1 and entityid = #{entityId}