[file 清退] 提交代码 0528

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -621,12 +621,12 @@ public class JavaToPdfHtmlFreeMarker {
                 int pageCount = (remainder > 0) ? len/1568 + 1 :  len/1568;
                 while (page<pageCount-1) {
                     if (page==0) {
-                        documentDevice.setDeviceSerialNumber(documentDevice.getDeviceSerialNumber().substring(page * 1568, (page + 1) * 1568));
+                        documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber().substring(page * 1568, (page + 1) * 1568)));
                         list.add(documentDevice);
                         lists.add(list);
                     }else {
                         DocumentDevice documentDevice1=new DocumentDevice();
-                        documentDevice1.setDeviceSerialNumber(deviceSerialNumber.substring(page * 1568, (page + 1) * 1568));
+                        documentDevice1.setDeviceSerialNumber(toString(deviceSerialNumber.substring(page * 1568, (page + 1) * 1568)));
                         list.add(documentDevice1);
                         lists.add(list);
                     }
@@ -634,7 +634,7 @@ public class JavaToPdfHtmlFreeMarker {
                     page++;
                 }
                 DocumentDevice documentDevice1=new DocumentDevice();
-                documentDevice1.setDeviceSerialNumber(deviceSerialNumber.substring((pageCount-1)*1568, len));
+                documentDevice1.setDeviceSerialNumber(toString(deviceSerialNumber.substring((pageCount-1)*1568, len)));
                 list.add(documentDevice1);
                 count.set(len-(pageCount-1)*1568);
             }else if (len==1568){
@@ -648,8 +648,8 @@ public class JavaToPdfHtmlFreeMarker {
 //                    if (len>56) {
                     if (1568-count.get()>56) {
                         DocumentDevice documentDevice1 = new DocumentDevice();
-                        documentDevice1.setDeviceSerialNumber(documentDevice.getDeviceSerialNumber().substring(1568 - count.get(), len));
-                        documentDevice.setDeviceSerialNumber(documentDevice.getDeviceSerialNumber().substring(0, 1568 - count.get()));
+                        documentDevice1.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber().substring(1568 - count.get(), len)));
+                        documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber().substring(0, 1568 - count.get())));
                         list.add(documentDevice);
                         lists.add(list);
                         list = new ArrayList<>();
@@ -772,9 +772,9 @@ public class JavaToPdfHtmlFreeMarker {
     }
 
     private static String toString(String str){
-        int len=54;
+        int len=56;
         StringBuilder stringBuilder=new StringBuilder();
-        if (str.length()>54){
+        if (str.length()>56){
             boolean falg=true;
             int i=0;
             while (falg){

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -45,7 +45,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -661,6 +660,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
        if (storageDeviceRepel.getSenderName()!=null) {
             deviceRepelDetail.setSenderUserB(storageDeviceRepel.getSenderName());
        }
+        //获取相关单位的id集合
+        List<Integer> unitIds=new ArrayList<>();
+        unitIds.add(deviceRepelDetail.getSendUnitId());
+        unitIds.add(deviceRepelDetail.getReceiveUnitId());
+
        //判断是否为入库单据待补充 还是直接入库。
        RepelTaskStatistical repelTaskStatistical = repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
        if (storageDeviceRepel.getFileRets()!=null&&storageDeviceRepel.getFileRets().size()!=0) {
@@ -689,6 +693,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
             taskService.moveToEnd(taskBto);
             taskService.moveToEnd(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id,taskId));
             taskService.moveToArchive(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id,taskId));
+            addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"上传签收单,任务完成",findUnitIds(user.getUserId(),unitIds)));
        } else {
            if (storageDeviceRepel.getIsIgnore()==null) {
                List<StatusEnum> enumList=new ArrayList<>();
@@ -725,14 +730,14 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                FileRet fileRet= pdfService.billPdf(documents);
                deviceRepelDetail.setOutboundFile(JacksonUtil.toJSon(fileRet));
                deviceRepelDetail.setSendFiles(JacksonUtil.toJSon(fileRet));
+               addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"上传签收单,任务完成",findUnitIds(user.getUserId(),unitIds)));
            }
        }
         deviceRepelDetail.setReceiveTime(new Date());
         repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         isEnd(taskBto,deviceRepelDetail.getRepelId());
-        devLogAdd(findInvoleDevice(deviceRepelDetail.getDeviceIds()),deviceRepelDetail.getReceiveUnit()+"接收"+deviceRepelDetail.getSendUnit()+"装备清退装备，任务完成",storageDeviceRepel.getUserId());
-        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收了总任务["+deviceRepel.getTitle()+"]"+deviceRepelDetail.getSendUnit()+"的退回的装备",gainThisUser(user.getUserId(),user.getUnitsId())));
+        devLogAdd(findInvoleDevice(deviceRepelDetail.getDeviceIds()),"上传清退装备签收单,任务完成",storageDeviceRepel.getUserId());
 
     }
 
@@ -782,7 +787,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         isEnd(taskBto,deviceRepelDetail.getRepelId());
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"完成["+deviceRepel.getTitle()+"]本级清退任务",gainThisUser(user.getUserId(),user.getUnitsId())));
-
     }
 
     @Override
@@ -881,6 +885,10 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
         isEnd(fatherTask,deviceRepelDetailFather.getRepelId());
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
+        List<Integer> unitIds=new ArrayList<>();
+        unitIds.add(deviceRepelDetail.getSendUnitId());
+        unitIds.add(deviceRepelDetail.getReceiveUnitId());
+        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"装备清退任务,出库方上传了回执单据任务结束",findUnitIds(storageDeviceRepel.getUserId(),unitIds)));
     }
 
 
@@ -916,7 +924,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         enumList.add(StatusEnum.SEND_BACK_1206);
         enumList.add(StatusEnum.SEND_BACK_1208);
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),enumList);
-
         DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
         deviceRepelDetail.setRepelStatus(3);
         taskService.moveToEnd(taskBto);
@@ -1180,4 +1187,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
     private List<Integer> findUnitId(Integer unitId){
         return userService.findAllByUnite(unitId).stream().map(User::getUserId).collect(Collectors.toList());
     }
+
+    /**
+     * 根据单位id查询用户id集合
+     * @param unitId
+     * @return
+     */
+    private List<Integer> findUnitIds(Integer userId,List<Integer> unitIds){
+        return userService.findUnitsIdInUsers(unitIds).stream().filter(user -> user.getUserId()!=userId).map(User::getUserId).collect(Collectors.toList());
+    }
 }